summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-17 23:22:23 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-17 23:22:24 +0100
commit375a065009f11f786116a81d8d3a1edde32fe96b (patch)
tree5fcf59ee8b8721a4b9c05622757152cadaed3d6c /git-debrebase
parente57c54ab8b45cefb6087295a7a5eb61a678e1188 (diff)
git-debrebase: Rename new-upstream-v0 command to new-upstream
This UI is pretty good now, I think, for single-piece upstreams. For multi-piece ones, which are quite tricky anyway, it is tolerable, and we it doesn't steal much of the available syntax space. So we don't need the -v0 any more. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 216d7df..9e8d707 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1129,7 +1129,7 @@ sub do_stitch ($;$) {
stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
}
-sub cmd_new_upstream_v0 () {
+sub cmd_new_upstream () {
# automatically and unconditionally launders before rebasing
# if rebase --abort is used, laundering has still been done