Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ja/maint-pull-rebase-doc' into maint
author
Junio C Hamano
<gitster@pobox.com>
Tue, 14 Dec 2010 15:36:23 +0000
(07:36 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 14 Dec 2010 15:36:23 +0000
(07:36 -0800)
* ja/maint-pull-rebase-doc:
git-pull.txt: Mention branch.autosetuprebase
1
2
Documentation/git-pull.txt
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
6b090e1
c4f4157
)
diff --cc
Documentation/git-pull.txt
Simple merge