diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2022-06-17 08:57:35 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2022-06-17 08:57:35 +0800 |
| commit | 2b288c472487ff82734244ec6db632e41d1e73fb (patch) | |
| tree | 2ffd8a55d5976dfc2f800e5721cd0bab9a4638ed | |
| parent | l10n: es: update translation (diff) | |
| parent | builtin/rebase: remove a redundant space in l10n string (diff) | |
| download | git-2b288c472487ff82734244ec6db632e41d1e73fb.tar.gz git-2b288c472487ff82734244ec6db632e41d1e73fb.zip | |
Merge branch 'master' of github.com:git/git
* 'master' of github.com:git/git:
builtin/rebase: remove a redundant space in l10n string
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 640b6046a5..70aa7c842f 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -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) { |