t/lib-rebase: update the documentation of FAKE_LINES

charvi-077 · gitster · commit 75ace8329c73 · 2021-02-10T13:58:19.000-08:00
FAKE_LINES helper function use underscore to embed a space in a single
command. Let's document it and also update the list of commands.

Mentored-by: Christian Couder &lt;chriscool@tuxfamily.org&gt;
Mentored-by: Phillip Wood &lt;phillip.wood@dunelm.org.uk&gt;
Helped-by: Eric Sunshine &lt;sunshine@sunshineco.com&gt;
Signed-off-by: Charvi Mendiratta &lt;charvi077@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
@@ -15,10 +15,11 @@
 #       specified line.
 #
 #   "<cmd> <lineno>" -- add a line with the specified command
-#       ("pick", "squash", "fixup", "edit", "reword" or "drop") and the
-#       SHA1 taken from the specified line.
+#       ("pick", "squash", "fixup"|"fixup_-C"|"fixup_-c", "edit", "reword" or "drop")
+#       and the SHA1 taken from the specified line.
 #
-#   "exec_cmd_with_args" -- add an "exec cmd with args" line.
+#   "_" -- add a space, like "fixup_-C" implies "fixup -C" and
+#       "exec_cmd_with_args" add an "exec cmd with args" line.
 #
 #   "#" -- Add a comment line.
 #

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,11 @@`
`15`	`15`	`# specified line.`
`16`	`16`	`#`
`17`	`17`	`# "<cmd> <lineno>" -- add a line with the specified command`
`18`		`-# ("pick", "squash", "fixup", "edit", "reword" or "drop") and the`
`19`		`-# SHA1 taken from the specified line.`
	`18`	`+# ("pick", "squash", "fixup"\|"fixup_-C"\|"fixup_-c", "edit", "reword" or "drop")`
	`19`	`+# and the SHA1 taken from the specified line.`
`20`	`20`	`#`
`21`		`-# "exec_cmd_with_args" -- add an "exec cmd with args" line.`
	`21`	`+# "_" -- add a space, like "fixup_-C" implies "fixup -C" and`
	`22`	`+# "exec_cmd_with_args" add an "exec cmd with args" line.`
`22`	`23`	`#`
`23`	`24`	`# "#" -- Add a comment line.`
`24`	`25`	`#`