global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-19 07:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

"fixup! builtin rebase: support keep-empty option"

Browse Source 
This *would* be a fixup commit, except that we want to avoid rewriting
commits that we merged from upstream's `pu` branch. Instead, we want to
send a new iteration, and then re-merge the new iteration once it made
it into the `pu` branch.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2018-08-24 16:21:19 +02:00
committed by Jameson Miller
parent bcfee386b1
commit c0adcc65e9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/rebase.c
View File

@@ -1025,7 +1025,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
&options.allow_rerere_autoupdate,
N_("allow rerere to update index with resolved "
"conflict")),
OPT_BOOL(0, "keep-empty", &options.keep_empty,
OPT_BOOL('k', "keep-empty", &options.keep_empty,
N_("preserve empty commits during rebase")),
OPT_BOOL(0, "autosquash", &options.autosquash,
N_("move commits that begin with "