On Thu, 27 Jan 2011, Erik Carstensen wrote:

> It works nicely with git-gui as long as you don't touch the "Commit"
> button :) You can just use git-gui as an index editor: You can unstage
> parts of an already committed patch (in the Amend Last Commit mode),
> which only means that you apply the inverse of the unstaged change to
> the index, without touching the working tree. As long as you don't
> commit, this change will stay in the index, and it can be applied to
> the patch using stgit refresh --index.

Brilliant! We have a winner. Thanks a lot Erik.

And thanks to you poiting me in the right direction, I *finally* found
the command line solution (cause I typically prefer emacs/magit than
git gui)

  git reset HEAD^      .
  stg refresh --index

And that's it, the patch is spilled on the workspace.

Please note the subtle difference between:

  git reset HEAD^
  git reset HEAD^   .

God, git can be really cryptic sometimes. The first command break
StackGit, while the trailing dot does not. See "git help reset" for
why.


PS Catalin: I will look at your suggestions later.

_______________________________________________
stgit-users mailing list
[email protected]
https://mail.gna.org/listinfo/stgit-users

Reply via email to