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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jul 14, 2017 at 16:45 UTC
4b8b65d706f92887c9b80d586dbdcc2abfde60be
1 file changed
+7
-7
git-rebase--interactive.sh
+7
-7
@@ -155,13 +155,13 @@ reschedule_last_action () {
155
append_todo_help () {
156
gettext "
157
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
165
166
These lines can be re-ordered; they are executed from top to bottom.
167
" | git stripspace --comment-lines >>"$todo"