2011/1/27 Catalin Marinas <[email protected]>: >> >> The only feature I miss is: >> [st]git reset HEAD^ / [st]git commit --amend > > You could do something like: > > stg pop > stg show <popped-patch> | git apply
Thanks, this would work but I prefer to do it in the other, "applied" direction as suggested by Erik: stg show | git apply -R --cache # <=> git reset HEAD^ . # note the dot stg refresh --index I prefer the "applied" direction because: - No three-way merge; safer. Why have three ways when only two are required? A simple typo is enough to create a conflict and break a three way merge. In the "applied" direction the three-way merge window of vulnerability is very short (just the second between the two commands) leaving no room for operator error. - The first task to work on is the existing patch, as opposed to the hunks to be extracted from it. > A command "stg pop --spill" may be useful, if I understand your > scenario correctly. I am not 100% sure what you mean here. Note: I just saw a very similar feature request from 2007 in the bug tracker. _______________________________________________ stgit-users mailing list [email protected] https://mail.gna.org/listinfo/stgit-users
