projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit7aa50897dda0360b9cbbe23e723a5aee461e1d71
treefaa92da7147f6ffee7057a9e3afeaa2a6fca398ctree | snapshot
parentb5e104a0e69f224b89a849fa1e9b4064a36c2f4bcommit | diff
parentff00b682f203eb39876b57404916b4c54b6032c6commit | diff
Merge branch 'jc/maint-reset-unmerged-path' into maint

* jc/maint-reset-unmerged-path:
  reset [<commit>] paths...: do not mishandle unmerged paths
diff-lib.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.