kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:git/git 

* 'master' of github.com:git/git:
  builtin/rebase: remove a redundant space in l10n string
maint
Jiang Xin 2022-06-17 08:57:35 +08:00
parent 69635e5242 3b9a5a33c2
commit 2b288c4724
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/rebase.c
View File

@ -1206,7 +1206,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)

if (preserve_merges_selected)
die(_("--preserve-merges was replaced by --rebase-merges\n"
"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
"which is no longer supported; use 'merges' instead"));

if (action != ACTION_NONE && total_argc != 2) {