Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/merge-recursive-gitlink'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 13 Dec 2007 00:52:59 +0000
(16:52 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 13 Dec 2007 00:52:59 +0000
(16:52 -0800)
* jc/merge-recursive-gitlink:
Support a merge with conflicting gitlink change
raw
|
combined
(merge:
cfa97ae
ff72af0
)
Trivial merge