From: Junio C Hamano <gitster@pobox.com>
To: Philip Oakley <philipoakley@iee.email>
Cc: Denton Liu <liu.denton@gmail.com>, rottis@fea.st, git@vger.kernel.org
Subject: Re: git checkout --autostash and git branch --autopop
Date: Fri, 13 Dec 2019 09:16:19 -0800 [thread overview]
Message-ID: <xmqq7e30m9i4.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <e7850a51-4396-4698-ed98-62f991e33992@iee.email> (Philip Oakley's message of "Thu, 12 Dec 2019 22:02:14 +0000")
Philip Oakley <philipoakley@iee.email> writes:
> Isn't this meant to be something similar to the --no-merge option for
> checkout. That is: I am where I am, but really I want this to be on
> branch X. Or is the --no-merge option meant to be something else?
Is there a --no-merge option to "git checkout"? I know the reason
why I invented "git checkout --merge" was because I wanted the
command to carry more changes in the working tree than the default
behaviour would while checking out another branch, but I do not
think I added an option to do less, i.e. forbid it from carrying any
change in the working tree while checking out another branch.
next prev parent reply other threads:[~2019-12-13 20:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 12:19 git checkout --autostash and git branch --autopop rottis
2019-12-12 18:09 ` Denton Liu
2019-12-12 18:12 ` Denton Liu
2019-12-12 22:02 ` Philip Oakley
2019-12-13 17:16 ` Junio C Hamano [this message]
2019-12-14 11:12 ` Philip Oakley
[not found] ` <DA212C7D-D8D4-4E68-8C29-AF68364653E9@ssl-mail.com>
2019-12-14 12:58 ` Philip Oakley
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7e30m9i4.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=philipoakley@iee.email \
--cc=rottis@fea.st \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox