git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Konstantin Tokarev <annulen@yandex.ru>
Cc: Victor Porton <porton@narod.ru>,
	"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Feature: checkout and merge
Date: Mon, 12 Oct 2020 10:48:19 -0700	[thread overview]
Message-ID: <xmqqo8l7pc7w.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <5293161602514983@mail.yandex.ru> (Konstantin Tokarev's message of "Mon, 12 Oct 2020 18:04:19 +0300")

Konstantin Tokarev <annulen@yandex.ru> writes:

> 12.10.2020, 14:12, "Victor Porton" <porton@narod.ru>:
>> It is a very often need to checkout a branch and them merge the branch
>> that was before the checkout. Moreover after this is very often needed
>> to push.
>>
>> So please add the flags to `checkout`:
>>
>> 1. to merge the old branch immediately after checkout
>>
>> 2. to push after checkout
>>
>> I repeatedly write:
>>
>> git checkout stable && git merge main && git push && git checkout main
>>
>> (I am not subscribed to this mailing list.)
>
> Why not make a shell script to do this?

Sounds like a very sensible suggestion.  "merging and then pushing
immediately after" without any validation step in between is not for
everybody and being able to implement such a custom workflow is why
we have these individual steps as discrete commands.

Thanks.

  reply	other threads:[~2020-10-12 17:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-12 11:05 Feature: checkout and merge Victor Porton
2020-10-12 15:04 ` Konstantin Tokarev
2020-10-12 17:48   ` Junio C Hamano [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-10-12 11:05 Victor Porton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqo8l7pc7w.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=annulen@yandex.ru \
    --cc=git@vger.kernel.org \
    --cc=porton@narod.ru \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).