![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Aug 2011 22:00:08 +0000 (15:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Aug 2011 22:00:08 +0000 (15:00 -0700) | ||
| commit | 1df561fb4861708ce208488aa307516c0ecfa968 | |
| tree | d642bff3822cc638967d3fc6c54d2060e21ec0cf | tree | snapshot |
| parent | 259bcfb6b987021be592ed640253215bcbbf6d7d | commit | diff |
| parent | ff00b682f203eb39876b57404916b4c54b6032c6 | commit | diff |
Merge branch 'jc/maint-reset-unmerged-path'
* jc/maint-reset-unmerged-path:
reset [<commit>] paths...: do not mishandle unmerged paths
* jc/maint-reset-unmerged-path:
reset [<commit>] paths...: do not mishandle unmerged paths
| diff-lib.c | diff1 | | diff2 | | blob | history |