~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement the 'clone' command
[stgit]
/
stgit
/
commands
/
pop.py
diff --git
a/stgit/commands/pop.py
b/stgit/commands/pop.py
index
fb85eb8
..
3da135c
100644
(file)
--- a/
stgit/commands/pop.py
+++ b/
stgit/commands/pop.py
@@
-25,7
+25,11
@@
from stgit import stack, git
help = 'pop the top of the series'
help = 'pop the top of the series'
-usage = '%prog [options]'
+usage = """%prog [options]
+
+Pop the topmost patch or a range of patches starting with the topmost
+one from the stack. The command fails if there are local changes or
+conflicts."""
options = [make_option('-a', '--all',
help = 'pop all the applied patches',
options = [make_option('-a', '--all',
help = 'pop all the applied patches',