development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
* 'master' of github.com:git/git:
  builtin/rebase: remove a redundant space in l10n string
This commit is contained in:
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) {