git-rebase.sh: update help messages a bit
signoff is not specific to the am-backend. Also, re-order a few options to make like things (e.g. strategy and strategy-option) be near each other. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Jun 25, 2018 at 09:12 UTC
d4e80629ff480cbddd8c1ac7e7cfb86d58978514
1 file changed
+3
-3
git-rebase.sh
+3
-3
@@ -20,23 +20,23 @@ onto=! rebase onto given branch instead of upstream
20
r,rebase-merges? try to rebase merges instead of skipping them
21
p,preserve-merges! try to recreate merges instead of ignoring them
22
s,strategy=! use the given merge strategy
23
+X,strategy-option=! pass the argument through to the merge strategy
24
no-ff! cherry-pick all commits, even if unchanged
25
+f,force-rebase! cherry-pick all commits, even if unchanged
26
m,merge! use merging strategies to rebase
27
i,interactive! let the user edit the list of commits to rebase
28
x,exec=! add exec lines after each commit of the editable list
29
k,keep-empty preserve empty commits during rebase
30
allow-empty-message allow rebasing commits with empty messages
29
-f,force-rebase! force rebase even if branch is up to date
30
-X,strategy-option=! pass the argument through to the merge strategy
31
stat! display a diffstat of what changed upstream
32
n,no-stat! do not show diffstat of what changed upstream
33
verify allow pre-rebase hook to run
34
rerere-autoupdate allow rerere to update index with resolved conflicts
35
root! rebase all reachable commits up to the root(s)
36
autosquash move commits that begin with squash!/fixup! under -i
37
+signoff add a Signed-off-by: line to each commit
38
committer-date-is-author-date! passed to 'git am'
39
ignore-date! passed to 'git am'
39
-signoff passed to 'git am'
40
whitespace=! passed to 'git apply'
41
ignore-whitespace! passed to 'git apply'
42
C=! passed to 'git apply'