summaryrefslogtreecommitdiff
path: root/t/t3418-rebase-continue.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-17 21:37:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-17 21:37:09 -0700
commit66d2c22f416cda652f08e8db5820abf3e87592e5 (patch)
treead4e5e2e38eec22aa6cb769e5d2d1dd896b19629 /t/t3418-rebase-continue.sh
parentMerge branch 'js/bisect-no-checkout' (diff)
parentcheckout $tree $path: do not clobber local changes in $path not in $tree (diff)
downloadtgif-66d2c22f416cda652f08e8db5820abf3e87592e5.tar.xz
Merge branch 'jc/checkout-from-tree-keep-local-changes'
* jc/checkout-from-tree-keep-local-changes: checkout $tree $path: do not clobber local changes in $path not in $tree
Diffstat (limited to 't/t3418-rebase-continue.sh')
0 files changed, 0 insertions, 0 deletions