~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename "stg assimilate" to "stg repair"
[stgit]
/
stgit
/
main.py
diff --git
a/stgit/main.py
b/stgit/main.py
index
e8242c2
..
a03447f
100644
(file)
--- a/
stgit/main.py
+++ b/
stgit/main.py
@@
-60,7
+60,6
@@
class Commands(dict):
commands = Commands({
'add': 'add',
'applied': 'applied',
commands = Commands({
'add': 'add',
'applied': 'applied',
- 'assimilate': 'assimilate',
'branch': 'branch',
'delete': 'delete',
'diff': 'diff',
'branch': 'branch',
'delete': 'delete',
'diff': 'diff',
@@
-89,6
+88,7
@@
commands = Commands({
'rebase': 'rebase',
'refresh': 'refresh',
'rename': 'rename',
'rebase': 'rebase',
'refresh': 'refresh',
'rename': 'rename',
+ 'repair': 'repair',
'resolved': 'resolved',
'rm': 'rm',
'series': 'series',
'resolved': 'resolved',
'rm': 'rm',
'series': 'series',
@@
-109,7
+109,6
@@
repocommands = (
)
stackcommands = (
'applied',
)
stackcommands = (
'applied',
- 'assimilate',
'branch',
'clean',
'commit',
'branch',
'clean',
'commit',
@@
-122,6
+121,7
@@
stackcommands = (
'pull',
'push',
'rebase',
'pull',
'push',
'rebase',
+ 'repair',
'series',
'sink',
'top',
'series',
'sink',
'top',