diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-08-01 15:00:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-01 15:00:08 -0700 |
commit | 1df561fb4861708ce208488aa307516c0ecfa968 (patch) | |
tree | d642bff3822cc638967d3fc6c54d2060e21ec0cf /notes-merge.h | |
parent | Merge branch 'maint' (diff) | |
parent | reset [<commit>] paths...: do not mishandle unmerged paths (diff) | |
download | tgif-1df561fb4861708ce208488aa307516c0ecfa968.tar.xz |
Merge branch 'jc/maint-reset-unmerged-path'
* jc/maint-reset-unmerged-path:
reset [<commit>] paths...: do not mishandle unmerged paths
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions