summaryrefslogtreecommitdiff
path: root/xdiff/xutils.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-20 12:22:58 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-20 12:22:58 -0800
commit806e5c8682c8621b19529c21899dcb14a1035d11 (patch)
treec1fe88e5faa88f61548393583acd89092e7521d7 /xdiff/xutils.h
parentMerge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1... (diff)
parentreset: unbreak hard resets with GIT_WORK_TREE (diff)
downloadtgif-806e5c8682c8621b19529c21899dcb14a1035d11.tar.xz
Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5
* jk/maint-1.6.5-reset-hard: reset: unbreak hard resets with GIT_WORK_TREE
Diffstat (limited to 'xdiff/xutils.h')
0 files changed, 0 insertions, 0 deletions