summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLiam Beguin <liambeguin@gmail.com>2017-12-03 22:17:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-04 17:02:21 (GMT)
commitf3b633dad4cc54c7cdaa007e97d00b2c935c9a90 (patch)
tree3f8965d8591649483d2cc541343ecdfff3d84124 /Documentation
parent946a9f20b46b6cf8fbfbcc69ed97182f8696bb8d (diff)
downloadgit-f3b633dad4cc54c7cdaa007e97d00b2c935c9a90.zip
git-f3b633dad4cc54c7cdaa007e97d00b2c935c9a90.tar.gz
git-f3b633dad4cc54c7cdaa007e97d00b2c935c9a90.tar.bz2
Documentation: use preferred name for the 'todo list' script
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/rebase-config.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/rebase-config.txt b/Documentation/rebase-config.txt
index dba088d..30ae08c 100644
--- 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`
- 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
- 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.