tree e41f9df2842aa74a3c692d733e1a09d708c2c413
parent ab0fb57aac6c5b6f074c07c7e2729bcff58cc45d
parent d50d31e8808261eccfa6bde826e5e63368e29573
author Junio C Hamano <gitster@pobox.com> 1427838851 -0700
committer Junio C Hamano <gitster@pobox.com> 1427838852 -0700

Merge branch 'ss/pull-rebase-preserve' into maint

* ss/pull-rebase-preserve:
  docs: clarify what git-rebase's "-p" / "--preserve-merges" does
  docs: clarify "preserve" option wording for git-pull