summaryrefslogtreecommitdiff
path: root/compat/win32.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-21 10:49:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-21 10:49:24 -0700
commitdf6840855d24c2f54c0b8a66cbac33d8af43333a (patch)
tree355715d1b644e9fd88307485c424dfadcdae7e81 /compat/win32.h
parentMerge branch 'mm/maint-config-explicit-bool-display' into maint (diff)
parentcheckout $tree $path: do not clobber local changes in $path not in $tree (diff)
downloadtgif-df6840855d24c2f54c0b8a66cbac33d8af43333a.tar.xz
Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint
* jc/checkout-from-tree-keep-local-changes: checkout $tree $path: do not clobber local changes in $path not in $tree
Diffstat (limited to 'compat/win32.h')
0 files changed, 0 insertions, 0 deletions