# [PATCH] merge: allow "-" as a short-hand for "previous branch" 5 messages from 2011-04-07 to 2011-04-08. Participants: Junio C Hamano, Thomas Adam, Michael J Gruber. Thread: https://gitlist.dev/t/27029 ## Junio C Hamano, 2011-04-07 23:03 Subject: [PATCH] merge: allow "-" as a short-hand for "previous branch" Message-ID: <7vmxk164wd.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vmxk164wd.fsf%40alter.siamese.dyndns.org ``` Just like "git checkout -" is a short-hand for "git checkout @{-1}" to conveniently switch back to the previous branch, "git merge -" is a short-hand for "git merge @{-1}" to conveniently merge the previous branch. It will allow me to say: $ git checkout -b au/topic $ git am -s ./+au-topic.mbox $ git checkout pu $ git merge - which is an extremely typical and repetitive operation during my git day. Signed-off-by: Junio C Hamano --- builtin/merge.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index d54e7dd..0bdd19a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1062,9 +1062,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix) if (!allow_fast_forward && fast_forward_only) die(_("You cannot combine --no-ff with --ff-only.")); - if (!argc && !abort_current_merge && default_to_upstream) - argc = setup_with_upstream(&argv); - + if (!abort_current_merge) { + if (!argc && default_to_upstream) + argc = setup_with_upstream(&argv); + else if (argc == 1 && !strcmp(argv[0], "-")) + argv[0] = "@{-1}"; + } if (!argc) usage_with_options(builtin_merge_usage, builtin_merge_options); -- 1.7.5.rc1 ``` ## Thomas Adam, 2011-04-07 23:13 Subject: Re: [PATCH] merge: allow "-" as a short-hand for "previous branch" Message-ID: URL: https://gitlist.dev/e/BANLkTikA3dFQpZWC%3DTC3%2Bzp2FS%3DuBBxf0Q%40mail.gmail.com In-Reply-To: <7vmxk164wd.fsf@alter.siamese.dyndns.org> ``` Hi, On 8 April 2011 00:03, Junio C Hamano wrote: > Just like "git checkout -" is a short-hand for "git checkout @{-1}" to > conveniently switch back to the previous branch, "git merge -" is a > short-hand for "git merge @{-1}" to conveniently merge the previous branch. > > It will allow me to say: > >    $ git checkout -b au/topic >    $ git am -s ./+au-topic.mbox >    $ git checkout pu >    $ git merge - I agree this is is useful, but is there a danger of this being a common typo, and people merging in previous branches a lot more often than they ever intended? In the case of "git checkout -" that's not as fatal, but if I ever mistype "git merge -" -- I'm now left with an unraveling exercise to do. Hopefully it won't be an issue, as it's no worse than mistyping branch names -- I suppose it's the sheer length of "-" in this case which leads to more potential for problems. -- Thomas Adam ``` ## Junio C Hamano, 2011-04-07 23:26 Subject: Re: [PATCH] merge: allow "-" as a short-hand for "previous branch" Message-ID: <7vbp0h63sw.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vbp0h63sw.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Thomas Adam writes: > I agree this is is useful, but is there a danger of this being a > common typo, and people merging in previous branches a lot more often > than they ever intended? In the case of "git checkout -" that's not > as fatal, but if I ever mistype "git merge -" -- I'm now left with an > unraveling exercise to do. Just like you can checkout the previous branch back if you found you checked out a wrong branch by a typo, if you found that you merged a wrong branch, you can just reset it away back to ORIG_HEAD, no? Or am I missing something more obvious? ``` ## Michael J Gruber, 2011-04-08 09:30 Subject: Re: [PATCH] merge: allow "-" as a short-hand for "previous branch" Message-ID: <4D9ED5AC.3050106@drmicha.warpmail.net> URL: https://gitlist.dev/e/4D9ED5AC.3050106%40drmicha.warpmail.net In-Reply-To: <7vbp0h63sw.fsf@alter.siamese.dyndns.org> ``` Junio C Hamano venit, vidit, dixit 08.04.2011 01:26: > Thomas Adam writes: > >> I agree this is is useful, but is there a danger of this being a >> common typo, and people merging in previous branches a lot more often >> than they ever intended? In the case of "git checkout -" that's not >> as fatal, but if I ever mistype "git merge -" -- I'm now left with an >> unraveling exercise to do. > > Just like you can checkout the previous branch back if you found you > checked out a wrong branch by a typo, if you found that you merged a wrong > branch, you can just reset it away back to ORIG_HEAD, no? > > Or am I missing something more obvious? Only tests and doc :) Seriously, I like that. If there are more places where this makes sense (I haven't looked) we might even factor it out. In principle it makes sense everywhere where a branch name makes sense, e.g.: git branch -D foo #...can't delete the current branch git checkout whatever git branch -D - In this case, shell history is faster, of course. Michael ``` ## Junio C Hamano, 2011-04-08 18:43 Subject: Re: [PATCH] merge: allow "-" as a short-hand for "previous branch" Message-ID: <7vipuo4m91.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vipuo4m91.fsf%40alter.siamese.dyndns.org In-Reply-To: <4D9ED5AC.3050106@drmicha.warpmail.net> ``` Michael J Gruber writes: > ... In principle it makes > sense everywhere where a branch name makes sense, e.g.: > > git branch -D foo > #...can't delete the current branch > git checkout whatever > git branch -D - > > In this case, shell history is faster, of course. Yeah, and "branch -[dD]" is truly destructive, so... ```