OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
57e4c17
2ea3df6
)
Sync with maint
author
Junio C Hamano
<gitster@pobox.com>
Thu, 5 Sep 2013 21:41:40 +0000
(14:41 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 5 Sep 2013 21:41:40 +0000
(14:41 -0700)
* maint:
Documentation/git-merge.txt: fix formatting of example block
Trivial merge