commit | ad00aebfe93b3fc79c5ed54569f1603b8030783a | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Tue Mar 31 14:54:11 2015 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Tue Mar 31 14:54:12 2015 -0700 |
tree | e41f9df2842aa74a3c692d733e1a09d708c2c413 | |
parent | ab0fb57aac6c5b6f074c07c7e2729bcff58cc45d [diff] | |
parent | d50d31e8808261eccfa6bde826e5e63368e29573 [diff] |
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