зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
62db524779
Коммит
4b8b65d706
|
@ -155,13 +155,13 @@ reschedule_last_action () {
|
||||||
append_todo_help () {
|
append_todo_help () {
|
||||||
gettext "
|
gettext "
|
||||||
Commands:
|
Commands:
|
||||||
p, pick = use commit
|
p, pick = use commit
|
||||||
r, reword = use commit, but edit the commit message
|
r, reword = use commit, but edit the commit message
|
||||||
e, edit = use commit, but stop for amending
|
e, edit = use commit, but stop for amending
|
||||||
s, squash = use commit, but meld into previous commit
|
s, squash = use commit, but meld into previous commit
|
||||||
f, fixup = like \"squash\", but discard this commit's log message
|
f, fixup = like \"squash\", but discard this commit's log message
|
||||||
x, exec = run command (the rest of the line) using shell
|
x, exec = run command (the rest of the line) using shell
|
||||||
d, drop = remove commit
|
d, drop = remove commit
|
||||||
|
|
||||||
These lines can be re-ordered; they are executed from top to bottom.
|
These lines can be re-ordered; they are executed from top to bottom.
|
||||||
" | git stripspace --comment-lines >>"$todo"
|
" | git stripspace --comment-lines >>"$todo"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче