From: Johannes Sixt <J.Sixt@eudaptics•com>
To: git@vger•kernel.org
Subject: Re: Merging commits together into a super-commit
Date: Thu, 10 May 2007 13:40:12 +0200 [thread overview]
Message-ID: <4643049C.3D5F30D8@eudaptics.com> (raw)
In-Reply-To: 1178794261.5806.98.camel@murta.transitives.com
Alex Bennee wrote:
> I really love the fact I can micro-commit changes when I'm developing.
> However at some point the combination of changes I have made can be
> considered a single body of work. This is especially true when you start
> doing things like re-basing on code that has moved around a lot. You
> don't want to be correcting a whole bunch of merge failures for every
> commit in your current tree.
>
> So far the only was I can see to do this is a:
>
> git-diff master..HEAD > my.patch
>
> And then re-applying your patch in stages, manually doing the commits.
>
> Am I missing something?
>
> I'm thinking something like git-cherrypick taking multiple commits and
> create a new super commit on a new tree. i.e.:
>
> git-cherrypick -m "Valgrind fixes" 12345.. 12678.. 565757..
>
> Merging the existing commit comments would be nice too.
Here we go:
- cherry-pick them before commit
$ git cherry-pick -n x
$ git cherry-pick -n y
$ git cherry-pick -n z
$ git commit -m "$(for c in x y z; do git show --stat $c; done)" -e
- merge in a single commit
$ git merge --squash foo
You didn't really think that git couldn't do that, did you? ;)
-- Hannes
next prev parent reply other threads:[~2007-05-10 11:56 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-10 10:51 Merging commits together into a super-commit Alex Bennee
2007-05-10 11:19 ` Raimund Bauer
2007-05-10 11:32 ` Alex Bennee
2007-05-10 11:43 ` Johannes Schindelin
2007-05-10 11:40 ` Johannes Sixt [this message]
2007-05-10 16:01 ` Linus Torvalds
2007-05-10 16:57 ` Carl Worth
2007-05-10 17:14 ` J. Bruce Fields
2007-05-10 18:30 ` Carl Worth
2007-05-10 19:21 ` Petr Baudis
2007-05-10 19:48 ` Carl Worth
2007-05-10 20:02 ` Using StGIT for tweaking already-committed stuff Petr Baudis
2007-05-10 21:16 ` Carl Worth
2007-05-11 5:48 ` Integrate StGIT into Git? (Was: Re: Using StGIT for tweaking already-committed stuff) Jan Hudec
2007-05-10 22:23 ` Using StGIT for tweaking already-committed stuff Karl Hasselström
2007-05-11 20:40 ` Yann Dirson
2007-05-11 22:43 ` Karl Hasselström
2007-05-12 7:10 ` Yann Dirson
2007-05-12 11:09 ` Karl Hasselström
2007-05-10 20:29 ` Merging commits together into a super-commit Robin Rosenberg
2007-05-12 11:34 ` Yann Dirson
2007-05-12 13:59 ` Jakub Narebski
2007-05-12 14:02 ` Karl Hasselström
2007-05-12 14:41 ` Yann Dirson
2007-05-12 17:03 ` Karl Hasselström
2007-05-12 19:27 ` Junio C Hamano
2007-05-13 18:43 ` Karl Hasselström
2007-05-13 19:35 ` Yann Dirson
2007-05-14 19:28 ` [StGIT PATCH] Store branch description in the config file Karl Hasselström
2007-05-10 19:22 ` Merging commits together into a super-commit J. Bruce Fields
2007-05-10 19:47 ` Petr Baudis
2007-05-10 19:51 ` J. Bruce Fields
2007-05-12 9:53 ` Transactions for git (and stgit) ? Yann Dirson
2007-05-12 10:49 ` Karl Hasselström
2007-05-12 18:34 ` Yann Dirson
-- strict thread matches above, loose matches on Subject: below --
2007-05-10 21:55 Merging commits together into a super-commit linux
2007-05-11 11:54 ` Alex Riesen
[not found] ` <9909dee80705110537j7e6d1426p7723c110c0a2c667@mail.gmail.com>
2007-05-11 12:41 ` Eugine Kosenko
2007-05-12 13:02 ` Jan Hudec
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=4643049C.3D5F30D8@eudaptics.com \
--to=j.sixt@eudaptics$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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