summaryrefslogtreecommitdiff
path: root/archive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-01 22:00:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-01 22:00:08 (GMT)
commit1df561fb4861708ce208488aa307516c0ecfa968 (patch)
treed642bff3822cc638967d3fc6c54d2060e21ec0cf /archive.c
parent259bcfb6b987021be592ed640253215bcbbf6d7d (diff)
parentff00b682f203eb39876b57404916b4c54b6032c6 (diff)
downloadgit-1df561fb4861708ce208488aa307516c0ecfa968.zip
git-1df561fb4861708ce208488aa307516c0ecfa968.tar.gz
git-1df561fb4861708ce208488aa307516c0ecfa968.tar.bz2
Merge branch 'jc/maint-reset-unmerged-path'
* jc/maint-reset-unmerged-path: reset [<commit>] paths...: do not mishandle unmerged paths
Diffstat (limited to 'archive.c')
0 files changed, 0 insertions, 0 deletions