]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5e104a ff00b68)
Merge branch 'jc/maint-reset-unmerged-path' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:41:28 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:41:28 +0000 (11:41 -0700)
* jc/maint-reset-unmerged-path:
  reset [<commit>] paths...: do not mishandle unmerged paths

1  2 
diff-lib.c patch | diff1 | diff2 | blob | history

diff --cc diff-lib.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.