Andrew's git / gitweb.git / diff
?
Sync with 2.3.5
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Mar 2015 21:58:38 +0000 (14:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Mar 2015 21:58:38 +0000 (14:58 -0700)
* maint:
Git 2.3.5
docs: clarify what git-rebase's "-p" / "--preserve-merges" does

1  2 
Documentation/git-rebase.txt patch | diff1 | diff2 | blob | history
Documentation/git.txt patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-rebase.txt
Simple merge
diff --cc Documentation/git.txt
Simple merge