summaryrefslogtreecommitdiff
path: root/t/t1000-read-tree-m-3way.sh
diff options
context:
space:
mode:
authorLibravatar Eric Wong <normalperson@yhbt.net>2006-12-08 13:29:55 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-09 11:09:27 -0800
commitd9671b75ad3bbf2f95f11a8571e9beaa12ccf6dd (patch)
tree77927d02162907505221d58d57c0af972fb6a1cd /t/t1000-read-tree-m-3way.sh
parentDocumentation: simpler shared repository creation (diff)
downloadtgif-d9671b75ad3bbf2f95f11a8571e9beaa12ccf6dd.tar.xz
rerere: add clear, diff, and status commands
git-am and git-rebase will be updated to use 'clear', and diff/status can be used to aid the user in tracking progress in the resolution process. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t1000-read-tree-m-3way.sh')
0 files changed, 0 insertions, 0 deletions