]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
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
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 04:45:14 +0000 (21:45 -0700)
committerJunio 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
Unnamed repository; edit this file 'description' to name the repository.