~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
StGIT bash completion
[stgit]
/
stgit
/
commands
/
fold.py
diff --git
a/stgit/commands/fold.py
b/stgit/commands/fold.py
index
8b796ca
..
e87ded2
100644
(file)
--- a/
stgit/commands/fold.py
+++ b/
stgit/commands/fold.py
@@
-71,10
+71,10
@@
def func(parser, options, args):
if options.threeway:
crt_patch = crt_series.get_patch(current)
bottom = crt_patch.get_bottom()
if options.threeway:
crt_patch = crt_series.get_patch(current)
bottom = crt_patch.get_bottom()
- git.apply_patch(filename
,
bottom)
+ git.apply_patch(filename
= filename, base =
bottom)
elif options.base:
elif options.base:
- git.apply_patch(filename
,
git_id(options.base))
+ git.apply_patch(filename
= filename, base =
git_id(options.base))
else:
else:
- git.apply_patch(filename)
+ git.apply_patch(filename
= filename
)
print 'done'
print 'done'