summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-01 15:00:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-01 15:00:08 -0700
commit1df561fb4861708ce208488aa307516c0ecfa968 (patch)
treed642bff3822cc638967d3fc6c54d2060e21ec0cf /advice.h
parentMerge branch 'maint' (diff)
parentreset [<commit>] paths...: do not mishandle unmerged paths (diff)
downloadtgif-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 'advice.h')
0 files changed, 0 insertions, 0 deletions