summaryrefslogtreecommitdiff
path: root/git-applymbox.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-19 23:52:05 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-19 23:52:05 -0700
commit2bd452d3b9f62ecc3406307cd6a5553856d21ff2 (patch)
tree5067e797be715933670ac52893b45f071b558aa4 /git-applymbox.sh
parentAdd git-unresolve <paths>... (diff)
downloadtgif-2bd452d3b9f62ecc3406307cd6a5553856d21ff2.tar.xz
git-update-index --unresolve
Retire git-unresolve and make it into "git-update-index --unresolve". It processes all paths that follow. During a merge, you would mark a path that is dealt with with: $ git update-index hello and you would "undo" it with: $ git update-index --unresolve hello Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-applymbox.sh')
0 files changed, 0 insertions, 0 deletions