Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sb/doc-upstream-branch'
author
Junio C Hamano
<gitster@pobox.com>
Sun, 12 Apr 2009 23:46:42 +0000
(16:46 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 12 Apr 2009 23:46:42 +0000
(16:46 -0700)
* sb/doc-upstream-branch:
Documentation: Introduce "upstream branch"
1
2
Documentation/config.txt
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
3e52eff
e892dc7
)
diff --cc
Documentation/config.txt
Simple merge