diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-04-28 23:31:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-02 13:32:07 +0900 |
| commit | 16d20bec69322684690f19da60c924fb51f430e2 (patch) | |
| tree | 3080b879624f3a820cb444f73c3b0fe5e986adad | |
| parent | f80f7eff5bd6b8bf39bcd2c41b7b72c4b8162a43 (diff) | |
| download | git-16d20bec69322684690f19da60c924fb51f430e2.tar.gz | |
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>
| -rw-r--r-- | git-rebase--interactive.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 609e150d38..c40b1fd1d2 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -155,13 +155,13 @@ reschedule_last_action () { append_todo_help () { gettext " Commands: - p, pick = use commit - r, reword = use commit, but edit the commit message - e, edit = use commit, but stop for amending - s, squash = use commit, but meld into previous commit - f, fixup = like \"squash\", but discard this commit's log message - x, exec = run command (the rest of the line) using shell - d, drop = remove commit +p, pick = use commit +r, reword = use commit, but edit the commit message +e, edit = use commit, but stop for amending +s, squash = use commit, but meld into previous commit +f, fixup = like \"squash\", but discard this commit's log message +x, exec = run command (the rest of the line) using shell +d, drop = remove commit These lines can be re-ordered; they are executed from top to bottom. " | git stripspace --comment-lines >>"$todo" |