Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/fix-add-u-unmerged' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 16 May 2011 23:37:33 +0000
(16:37 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 16 May 2011 23:37:33 +0000
(16:37 -0700)
* jc/fix-add-u-unmerged:
Fix "add -u" that sometimes fails to resolve unmerged paths
Conflicts:
builtin/add.c
raw
(from:
90e8b9b
)
No differences found