One can now say "git-checkout-index --stage=ours ..." or "git-checkout-index --stage=theirs ...", instead of having to remember the corresponding number assigned to each stage.
Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> --- builtin-checkout-index.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)
I find this quite helpful when resolving.
Show changes to builtin-checkout-index.c +10 −1
diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c index b097c88..d54a290 100644 --- a/builtin-checkout-index.c +++ b/builtin-checkout-index.c @@ -236,8 +236,17 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) int ch = arg[8]; if ('1' <= ch && ch <= '3') checkout_stage = arg[8] - '0'; + else if (!strncmp(arg+8, "ancestor", 8)) + checkout_stage = 1; + else if (!strncmp(arg+8, "ours", 4)) + checkout_stage = 2; + else if (!strncmp(arg+8, "HEAD", 4)) + checkout_stage = 2; + else if (!strncmp(arg+8, "theirs", 6)) + checkout_stage = 3; else - die("stage should be between 1 and 3 or all"); + die("stage should be " + "(1|ancestor)|(2|ours|HEAD)|(3|theirs)"); } continue; }
-- 1.4.4.1.gc87e