git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Attempt to improve git-rebase lead-in description.
Date: Sun, 18 Feb 2007 01:31:24 -0500	[thread overview]
Message-ID: <20070218063124.GA31350@spearce.org> (raw)
In-Reply-To: <er8d34$ssm$1@sea.gmane.org>

Jakub Narebski <jnareb@gmail.com> wrote:
> Shawn O. Pearce wrote:
> > +
> > +The commits that were previously saved into the temporary area are
> > +then reapplied to the current branch, one by one, in order.
> 
> Which is true for git-format-patch/git-am --3way driven "git rebase",
> but not for git-merge driven "git rebase --merge".
> 
> The description is certainly more user-friendly, but I'd rather it avoid
> mentioning saving to temporary area.

[note: Jakub broke this thread and sent the message twice, once
 to me privately and again to the list.  I originally accidentally
 replied to Jakub's privately sent copy.]

Uhhh...  go read the source for `git-rebase -m`.  We still put the
commits into a temporary area (.git/.dotest-merge), except we store
just their SHA-1 and message rather than the patch.  Its still a
temporary area.

Even if we did not store the commits in a temporary area, they
still are conceptually, as the ODB is storing them, and they aren't
connected to a ref anymore, as the ref was reset.

My description is accurate, in either mode.

-- 
Shawn.

      reply	other threads:[~2007-02-18  6:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-17  9:31 [PATCH] Attempt to improve git-rebase lead-in description Shawn O. Pearce
2007-02-18  2:21 ` Jakub Narebski
2007-02-18  6:31   ` Shawn O. Pearce [this message]

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=20070218063124.GA31350@spearce.org \
    --to=spearce@spearce.org \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.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 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 NNTP newsgroup(s).