mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cm/rebase-i-updates'

Browse Source 
Follow-up fixes to "cm/rebase-i" topic.

* cm/rebase-i-updates:
  doc/rebase -i: fix typo in the documentation of 'fixup' command
  t/t3437: fixup the test 'multiple fixup -c opens editor once'
  t/t3437: use named commits in the tests
  t/t3437: simplify and document the test helpers
  t/t3437: check the author date of fixed up commit
  t/t3437: remove the dependency of 'expected-message' file from tests
  t/t3437: fixup here-docs in the 'setup' test
  t/lib-rebase: update the documentation of FAKE_LINES
  rebase -i: clarify and fix 'fixup -c' rebase-todo help
  sequencer: rename a few functions
  sequencer: fixup the datatype of the 'flag' argument
This commit is contained in:
Junio C Hamano
2021-03-26 14:59:03 -07:00
parent ce4296cf2b fa153c1cd7
commit fde07fc356
5 changed files with 87 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
t/lib-rebase.sh
View File

@ -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.
#