]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1487eb6 4cc8d6c)
Merge branch 'jc/maint-add-u-remove-conflicted'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Feb 2009 08:26:17 +0000 (00:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Feb 2009 08:26:17 +0000 (00:26 -0800)
* jc/maint-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.