From: Marc Branchaud <marcnarc@xiplink.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Make 'remote show' distinguish between merged and rebased remote branches
Date: Tue, 10 Feb 2009 17:05:12 -0500 [thread overview]
Message-ID: <4991FA18.1040200@xiplink.com> (raw)
In-Reply-To: <7v3aemm1po.fsf@gitster.siamese.dyndns.org>
Junio C Hamano wrote:
>
> I sympathize with what you are trying to do but I do not think this is
> correct. You will *never* rebase remote on top of your changes; rather
> you will replay your changes on top of what the updated remote has.
>
> It is more like "if you start git pull while on branch rebaser, it will
> rebased on top of this branch from the remote".
>
I'm happy to use more accurate phrasing -- I was just going for a minimal change.
How about the following, consistent for both cases:
'git pull' merges branch master with remote branch
master
'git pull' rebases branch rebaser on top of remote branch
side
?
I like the above because the keywords & branch names are in consistent locations, making it easier to parse the output.
Marc
next prev parent reply other threads:[~2009-02-10 22:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-10 17:08 [PATCH] Make 'remote show' distinguish between merged and rebased remote branches Marc Branchaud
2009-02-10 21:17 ` Junio C Hamano
2009-02-10 22:05 ` Marc Branchaud [this message]
2009-02-10 23:13 ` Jay Soffian
2009-02-11 16:59 ` Marc Branchaud
2009-02-11 17:12 ` Johannes Sixt
2009-02-11 17:35 ` Junio C Hamano
2009-02-11 21:35 ` Marc Branchaud
2009-02-10 21:22 ` Johannes Schindelin
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=4991FA18.1040200@xiplink.com \
--to=marcnarc@xiplink.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.