git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Geoff Russell" <geoffrey.russell@gmail.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: collapsing commits with rebase
Date: Sat, 10 Jan 2009 21:04:57 +1030	[thread overview]
Message-ID: <93c3eada0901100234w37724281q424698f452b0148b@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0901081205120.30769@pacific.mpi-cbg.de>

On 1/8/09, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
>  On Thu, 8 Jan 2009, Geoff Russell wrote:
>
>  > On Thu, Jan 8, 2009 at 11:15 AM, Johannes Schindelin
>  > <Johannes.Schindelin@gmx.de> wrote:
>  >
>
> > > Alternatively, something like this should work for you:
>  > >
>  > >        $ git checkout A
>  > >        $ git read-tree -u -m D
>  > >        $ git commit -m "My message"
>  > >        $ git cherry-pick E
>  > >        $ git cherry-pick F
>  >
>  > Plan B is looking good, because I'd generally like the commit message to
>  > be the concatenation of the messages for B,C and D.
>
>
> Replace the commit call by this:
>
>         $ for commit in B C D
>           do
>                 git cat-file commit $commit | sed '1,/^$/d'
>                 # possibly add an empty line between the commit messages,
>                 # git commit will strip away empty lines at the end.
>           done |
>           git commit -F -
>
>  Hth,
>  Dscho

That makes sense, many thanks.

Cheers,
Geoff.

  reply	other threads:[~2009-01-10 10:36 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-08  0:08 collapsing commits with rebase Geoff Russell
2009-01-08  0:45 ` Johannes Schindelin
2009-01-08  1:59   ` Geoff Russell
2009-01-08 11:07     ` Johannes Schindelin
2009-01-10 10:34       ` Geoff Russell [this message]
2009-01-08  2:11 ` Boyd Stephen Smith Jr.
2009-01-08  2:32   ` Miklos Vajna
2009-01-08  2:39     ` Boyd Stephen Smith Jr.
2009-01-08  9:49       ` Geoff Russell
2009-01-08  4:09   ` Sitaram Chamarty
2009-01-08  4:23     ` Boyd Stephen Smith Jr.
2009-01-10 10:26 ` nadim khemir

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=93c3eada0901100234w37724281q424698f452b0148b@mail.gmail.com \
    --to=geoffrey.russell@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    /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).