summaryrefslogtreecommitdiff
path: root/rebase-interactive.c
diff options
context:
space:
mode:
authorDerrick Stolee <derrickstolee@github.com>2022-07-19 18:33:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-07-19 19:49:03 (GMT)
commita97d79163e16e2d3777ab4d86c8f006f260c2836 (patch)
tree29ca62fe322c23ef3e96704dc14f954860d7e2ce /rebase-interactive.c
parentd7ce9a220196b995117252bb236baf135c9b704f (diff)
downloadgit-a97d79163e16e2d3777ab4d86c8f006f260c2836.zip
git-a97d79163e16e2d3777ab4d86c8f006f260c2836.tar.gz
git-a97d79163e16e2d3777ab4d86c8f006f260c2836.tar.bz2
sequencer: add update-ref command
Add the boilerplate for an "update-ref" command in the sequencer. This connects to the current no-op do_update_ref() which will be filled in after more connections are created. The syntax in the todo list will be "update-ref <ref-name>" to signal that we should store the current commit as the value for updating <ref-name> at the end of the rebase. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rebase-interactive.c')
-rw-r--r--rebase-interactive.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/rebase-interactive.c b/rebase-interactive.c
index 2239422..1ff0764 100644
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -57,6 +57,9 @@ void append_todo_help(int command_count,
" create a merge commit using the original merge commit's\n"
" message (or the oneline, if no original merge commit was\n"
" specified); use -c <commit> to reword the commit message\n"
+"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n"
+" to this position in the new commits. The <ref> is\n"
+" updated at the end of the rebase\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n");
unsigned edit_todo = !(shortrevisions && shortonto);