]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab0fb57 d50d31e)
Merge branch 'ss/pull-rebase-preserve' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Mar 2015 21:54:11 +0000 (14:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Mar 2015 21:54:12 +0000 (14:54 -0700)
* ss/pull-rebase-preserve:
  docs: clarify what git-rebase's "-p" / "--preserve-merges" does
  docs: clarify "preserve" option wording for git-pull

1  2 
Documentation/git-rebase.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-rebase.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.