commit | 3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Sat Mar 28 09:37:51 2015 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Sat Mar 28 09:37:52 2015 -0700 |
tree | 3a73f3a9bfba6271f19c03b8553421ef6e61357c | |
parent | cf98c423b571e4afbd78fda3e65d03ed9bdd34fc [diff] | |
parent | 129260cbd42f2a9fb40055ac6ed32c7b75a5ec05 [diff] |
Merge branch 'ss/pull-rebase-preserve' * ss/pull-rebase-preserve: docs: clarify "preserve" option wording for git-pull