~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Rudimentary support for multiple development branches
[stgit]
/
stgit
/
commands
/
fold.py
diff --git
a/stgit/commands/fold.py
b/stgit/commands/fold.py
index
963c196
..
a9bb7fa
100644
(file)
--- a/
stgit/commands/fold.py
+++ b/
stgit/commands/fold.py
@@
-70,7
+70,7
@@
def func(parser, options, args):
bottom = crt_patch.get_bottom()
git.apply_patch(filename, bottom)
elif options.base:
- git.apply_patch(filename, git
.rev_parse
(options.base))
+ git.apply_patch(filename, git
_id
(options.base))
else:
git.apply_patch(filename)