]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf98c42 129260c)
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)
* ss/pull-rebase-preserve:
  docs: clarify "preserve" option wording for git-pull

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

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