public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Fredrik Tolf <fredrik@dolda2000•com>
To: git@vger•kernel.org
Subject: Re: Volume of commits
Date: Thu, 12 Jul 2007 16:51:44 +0200	[thread overview]
Message-ID: <m3ir8pu133.fsf@pc7.dolda2000.com> (raw)
In-Reply-To: 20070712140304.GB28310@diana.vm.bytemark.co.uk

Karl Hasselström <kha@treskal•com> writes:

> On 2007-07-12 15:16:47 +0200, Fredrik Tolf wrote:
>
>> Or do you somehow aggregate the smaller commits into larger patches
>> and recommit them? Or is there some third possibility that I'm
>> missing?
>
> Aggregating commits and recommitting is easy, so that's a common tool,
> I'd say. But it's equally possible to take a large commit and pick it
> apart, for example by editing the patch by hand and reapplying it, or
> by using the hunk selection feature of git-gui.

I see. Initially, it sounds like a lot of work, but the more I think
about it, the more I realize that it probably isn't that bad.

> [...]
> If you need to edit a commit that isn't HEAD, you can use git-reset to
> go back to the commit you want to edit, do the editing, and then use
> git-rebase to reapply the other commits on top of the changed commit.

git-rebase is one of those tools I haven't been looking at so far (I'm
still rather new to Git), so I should probably read through its
manpage.

> In general, there are a thousand ways to use git to rewrite history,
> either "by hand" or by using tools such as StGIT. (StGIT is what I
> personally use most of the time. I find it a good tool for producing
> readable patch series.)

I hadn't heard of StGIT, but it looks interesting.

Thanks for all the suggestions! I'll be needing some time to look them
through. :)

Fredrik Tolf

next prev parent reply	other threads:[~2007-07-12 14:52 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-12 13:16 Volume of commits Fredrik Tolf
2007-07-12 13:29 ` VMiklos
2007-07-12 13:59   ` Johannes Schindelin
2007-07-13 10:30     ` Sven Verdoolaege
2007-07-13 12:46       ` Alex Riesen
2007-07-21 17:09       ` [PATCH] rebase -i: call editor just once for a multi-squash Johannes Schindelin
2007-07-21 17:12       ` Volume of commits Johannes Schindelin
2007-07-12 13:49 ` Karl Hasselström
2007-07-12 14:03 ` Karl Hasselström
2007-07-12 14:51   ` Fredrik Tolf [this message]
2007-07-12 16:09     ` Joshua N Pritikin
2007-07-12 16:21     ` Karl Hasselström
2007-07-12 16:46 ` Linus Torvalds
2007-07-13  0:40 ` Jakub Narebski

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=m3ir8pu133.fsf@pc7.dolda2000.com \
    --to=fredrik@dolda2000$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox