summaryrefslogtreecommitdiff
path: root/t/t8003-blame.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-12-25 10:31:26 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-25 17:10:10 -0800
commit4a39f79d3482cd844443b4ef9a8ef9b3d72faa5b (patch)
tree0755156205fdd15cb3a72224e5ebc718f40f9a3e /t/t8003-blame.sh
parentresolve-undo: basic tests (diff)
downloadtgif-4a39f79d3482cd844443b4ef9a8ef9b3d72faa5b.tar.xz
resolve-undo: allow plumbing to clear the information
At the Porcelain level, operations such as merge that populate an initially cleanly merged index with conflicted entries clear the resolve-undo information upfront. Give scripted Porcelains a way to do the same, by implementing "update-index --clear-resolve-info". With this, a scripted Porcelain may "update-index --clear-resolve-info" first and repeatedly run "update-index --cacheinfo" to stuff unmerged entries to the index, to be resolved by the user with "git add" and stuff. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t8003-blame.sh')
0 files changed, 0 insertions, 0 deletions