Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 18 Oct 2013 20:53:48 +0000
(13:53 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 18 Oct 2013 20:53:48 +0000
(13:53 -0700)
* maint:
git-merge: document the -S option
raw
|
combined
(merge:
6c2bec9
5f737ac
)
Trivial merge