summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-16 11:41:28 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-16 11:41:28 -0700
commit7aa50897dda0360b9cbbe23e723a5aee461e1d71 (patch)
treefaa92da7147f6ffee7057a9e3afeaa2a6fca398c /commit.c
parentb5e104a0e69f224b89a849fa1e9b4064a36c2f4b (diff)
parentff00b682f203eb39876b57404916b4c54b6032c6 (diff)
downloadgit-7aa50897dda0360b9cbbe23e723a5aee461e1d71.tar.gz
Merge branch 'jc/maint-reset-unmerged-path' into maint
* jc/maint-reset-unmerged-path: reset [<commit>] paths...: do not mishandle unmerged paths
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions