Skip to content

Commit c9e282d

Browse files
committed
rebase -i: remove useless indentation
The commands used to be indented, and it is nice to look at, but when we transform the SHA-1s, the indentation is removed. So let's do away with it. For the moment, at least: when we will use the upcoming rebase--helper to transform the SHA-1s, we *will* keep the indentation and can reintroduce it. Yet, to be able to validate the rebase--helper against the output of the current shell script version, we need to remove the extra indentation. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 4db12b6 commit c9e282d

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

git-rebase--interactive.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ append_todo_help () {
149149
git stripspace --comment-lines >>"$todo" <<\EOF
150150
151151
Commands:
152-
p, pick = use commit
153-
r, reword = use commit, but edit the commit message
154-
e, edit = use commit, but stop for amending
155-
s, squash = use commit, but meld into previous commit
156-
f, fixup = like "squash", but discard this commit's log message
157-
x, exec = run command (the rest of the line) using shell
158-
d, drop = remove commit
152+
p, pick = use commit
153+
r, reword = use commit, but edit the commit message
154+
e, edit = use commit, but stop for amending
155+
s, squash = use commit, but meld into previous commit
156+
f, fixup = like "squash", but discard this commit's log message
157+
x, exec = run command (the rest of the line) using shell
158+
d, drop = remove commit
159159
160160
These lines can be re-ordered; they are executed from top to bottom.
161161

0 commit comments

Comments
 (0)