]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52cb573 c4f4157)
Merge branch 'ja/maint-pull-rebase-doc'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:53 +0000 (21:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:53 +0000 (21:49 -0800)
* ja/maint-pull-rebase-doc:
  git-pull.txt: Mention branch.autosetuprebase

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.