Merge branch 'ss/pull-rebase-preserve'
authorJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2015 16:37:51 +0000 (09:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2015 16:37:52 +0000 (09:37 -0700)
commit3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7
tree3a73f3a9bfba6271f19c03b8553421ef6e61357c
parentcf98c423b571e4afbd78fda3e65d03ed9bdd34fc
parent129260cbd42f2a9fb40055ac6ed32c7b75a5ec05
Merge branch 'ss/pull-rebase-preserve'

* ss/pull-rebase-preserve:
  docs: clarify "preserve" option wording for git-pull
Documentation/git-pull.txt