projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
54e7e78
4cc8d6c
)
Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1
author
Junio C Hamano
<gitster@pobox.com>
Fri, 13 Mar 2009 04:45:14 +0000
(21:45 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 13 Mar 2009 04:45:14 +0000
(21:45 -0700)
* jc/maint-1.6.1-add-u-remove-conflicted:
add -u: do not fail to resolve a path as deleted
Trivial merge
projects / git.git / commitdiff