Re: Unexpected behaviour with git stash save --keep-index?

On 2008-09-02 01:14:10 +0200, Jonas Flodén wrote:

[...]

This is what I usually do:

  1. Create a new StGit patch with all the changes.

  2. Pop that patch.

  3. View the patch in an emacs diff-mode buffer, and repeatedly

       a. apply one or more hunks, and

       b. create a new patch with just those changes

     until no more changes remain.

Another way to do it would be to

  1. Use e.g. git-gui to stage the changes you want in your first
     patch.

  2. Make an StGit patch out of just that (with e.g. stg new and stg
     refresh --index).

  3. If the worktree is still dirty, go to step 1.

A third method I usually make use of is to commit very often while developing, and periodically clump these microcommits together into larger commits. This sidesteps the whole problem of splitting up a commit into pieces, which can be quite a chore if splitting on hunk boundaries isn't enough. (stg coalesce will turn two or more smaller patches into one large patch for you. And I'm pretty sure git-rebase --interactive has some equivalent functions.)