![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Aug 2011 18:41:28 +0000 (11:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Aug 2011 18:41:28 +0000 (11:41 -0700) | ||
| commit | 7aa50897dda0360b9cbbe23e723a5aee461e1d71 | |
| tree | faa92da7147f6ffee7057a9e3afeaa2a6fca398c | tree | snapshot |
| parent | b5e104a0e69f224b89a849fa1e9b4064a36c2f4b | commit | diff |
| parent | ff00b682f203eb39876b57404916b4c54b6032c6 | commit | diff |
Merge branch 'jc/maint-reset-unmerged-path' into maint
* 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 |