diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-01 09:06:40 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-01 09:06:40 +0300 |
| commit | 95dd4b2b14db912b482320c0a69518e77e7af19a (patch) | |
| tree | 2669be208ec8d5660fa69ebda9006e16a0abd3d7 /git-rebase--interactive.sh | |
| parent | cbb408e6aef5b0d06facc16bb7a8615925894ad4 (diff) | |
| parent | 5971b0836eece0ffcafe15fd5d67934787ea1777 (diff) | |
Merge branch 'js/rebase-recreate-merge'
Hotfixes.
* js/rebase-recreate-merge:
sequencer: ensure labels that are object IDs are rewritten
git-rebase--interactive: fix copy-paste mistake
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 0c92ac00fa..06a7b79307 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -162,7 +162,7 @@ r, reword <commit> = use commit, but edit the commit message e, edit <commit> = use commit, but stop for amending s, squash <commit> = use commit, but meld into previous commit f, fixup <commit> = like \"squash\", but discard this commit's log message -x, exec <commit> = run command (the rest of the line) using shell +x, exec <command> = run command (the rest of the line) using shell d, drop <commit> = remove commit l, label <label> = label current HEAD with a name t, reset <label> = reset HEAD to a label |