1. Luke Plant
  2. histedit

Commits

Augie Fackler  committed ec4dfe9

Rename squash to fold, add drop.

  • Participants
  • Parent commits b05ea13
  • Branches default

Comments (0)

Files changed (2)

File __init__.py

View file
  • Ignore whitespace
 # Commands:
 #  p, pick = use commit
 #  e, edit = use commit, but stop for amending
-#  s, squash = use commit, but fold into previous commit
-#
-# If you remove a line here THAT COMMIT WILL BE LOST.
-# However, if you remove everything, the rebase will be aborted.
+#  f, fold = use commit, but fold into previous commit
+#  d, drop = remove commit from history
 #
 """
 
     assert False
 
 
-def squash(ui, repo, ctx, ha, opts):
+def fold(ui, repo, ctx, ha, opts):
+    assert False
+
+
+def drop(ui, repo, ctx, ha, opts):
     assert False
 
 
                'pick': pick,
                'e': edit,
                'edit': edit,
-               's': squash,
-               'squash': squash,
+               'f': fold,
+               'fold': fold,
+               'd': drop,
+               'drop': drop,
                }
 def histedit(ui, repo, *parent, **opts):
     """hg histedit <parent>

File tests/test-histedit-commute.out

View file
  • Ignore whitespace
 # Commands:
 #  p, pick = use commit
 #  e, edit = use commit, but stop for amending
-#  s, squash = use commit, but fold into previous commit
-#
-# If you remove a line here THAT COMMIT WILL BE LOST.
-# However, if you remove everything, the rebase will be aborted.
+#  f, fold = use commit, but fold into previous commit
+#  d, drop = remove commit from history
 #
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % edit the history