Skip to content

Commit 0a4c81d

Browse files
committed
rebase.c: state preserve-merges has been removed
Since feebd2d (rebase: hide --preserve-merges option, 2019-10-18) this option is now removed as stated in the subsequent release notes. Fix the option tip. Signed-off-by: Philip Oakley <[email protected]>
1 parent c4f0e30 commit 0a4c81d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/rebase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
11101110
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
11111111
parse_opt_interactive),
11121112
OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected,
1113-
N_("(DEPRECATED) try to recreate merges instead of "
1113+
N_("(REMOVED) try to recreate merges instead of "
11141114
"ignoring them"),
11151115
1, PARSE_OPT_HIDDEN),
11161116
OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),

0 commit comments

Comments
 (0)