~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Remove the resolved command
[stgit]
/
stgit
/
commands
/
rebase.py
diff --git
a/stgit/commands/rebase.py
b/stgit/commands/rebase.py
index
a4bc6e7
..
b949a5c
100644
(file)
--- a/
stgit/commands/rebase.py
+++ b/
stgit/commands/rebase.py
@@
-31,7
+31,7
@@
Pop all patches from current stack, move the stack base to the given
If you experience merge conflicts, resolve the problem and continue
the rebase by executing the following sequence:
- $
stg resolved -a [-i]
+ $
git add --update
$ stg refresh
$ stg goto top-patch