Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: use preferred name for the 'todo list' script
author
Liam Beguin
<liambeguin@gmail.com>
Sun, 3 Dec 2017 22:17:14 +0000
(17:17 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 4 Dec 2017 17:02:21 +0000
(09:02 -0800)
Use "todo list" instead of "instruction list" or "todo-list" to
reduce further confusion regarding the name of this script.
Signed-off-by: Liam Beguin <liambeguin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/rebase-config.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
946a9f2
)
diff --git
a/Documentation/rebase-config.txt
b/Documentation/rebase-config.txt
index dba088d7c68f5b730af70e3a8a4eedf0e3bd912e..30ae08cb5a4be4a68f529bff8674ba620daeb2e0 100644
(file)
--- a/
Documentation/rebase-config.txt
+++ b/
Documentation/rebase-config.txt
@@
-23,10
+23,10
@@
rebase.missingCommitsCheck::
--edit-todo' can then be used to correct the error. If set to
"ignore", no checking is done.
To drop a commit without warning or error, use the `drop`
--edit-todo' can then be used to correct the error. If set to
"ignore", no checking is done.
To drop a commit without warning or error, use the `drop`
- command in the todo
-
list.
+ command in the todo
list.
Defaults to "ignore".
rebase.instructionFormat::
A format string, as specified in linkgit:git-log[1], to be used for the
Defaults to "ignore".
rebase.instructionFormat::
A format string, as specified in linkgit:git-log[1], to be used for the
-
instruction
list during an interactive rebase. The format will
+
todo
list during an interactive rebase. The format will
automatically have the long commit hash prepended to the format.
automatically have the long commit hash prepended to the format.