aboutsummaryrefslogtreecommitdiff
path: root/git-gui/lib/diff.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-22 12:16:29 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-22 12:16:30 -0800
commit447c39a9b25e222a96711f7736078e4f33001388 (patch)
treeab7bebf74d7db8ef26222e88031c296f3e849f04 /git-gui/lib/diff.tcl
parentbef111d0a5e4b5dcac07f92b0fc918bb31184066 (diff)
parentc5326bd62b7e168ba1339dacb7ee812d0fe98c7c (diff)
downloadgit-447c39a9b25e222a96711f7736078e4f33001388.tar.gz
git-447c39a9b25e222a96711f7736078e4f33001388.tar.xz
Merge branch 'jk/checkout-from-tree' into maint
"git checkout $treeish $path", when $path in the index and the working tree already matched what is in $treeish at the $path, still overwrote the $path unnecessarily. * jk/checkout-from-tree: checkout $tree: do not throw away unchanged index entries
Diffstat (limited to 'git-gui/lib/diff.tcl')
0 files changed, 0 insertions, 0 deletions