Skip to content

Commit 4b8b65d

Browse files
dschogitster
authored andcommitted
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]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 62db524 commit 4b8b65d

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
@@ -155,13 +155,13 @@ reschedule_last_action () {
155155
append_todo_help () {
156156
gettext "
157157
Commands:
158-
p, pick = use commit
159-
r, reword = use commit, but edit the commit message
160-
e, edit = use commit, but stop for amending
161-
s, squash = use commit, but meld into previous commit
162-
f, fixup = like \"squash\", but discard this commit's log message
163-
x, exec = run command (the rest of the line) using shell
164-
d, drop = remove commit
158+
p, pick = use commit
159+
r, reword = use commit, but edit the commit message
160+
e, edit = use commit, but stop for amending
161+
s, squash = use commit, but meld into previous commit
162+
f, fixup = like \"squash\", but discard this commit's log message
163+
x, exec = run command (the rest of the line) using shell
164+
d, drop = remove commit
165165
166166
These lines can be re-ordered; they are executed from top to bottom.
167167
" | git stripspace --comment-lines >>"$todo"

0 commit comments

Comments
 (0)