diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 10:53:21 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 10:53:21 +0300 |
commit | 9d4a69f852bc00adc45585f0b54f11e30bf50782 (patch) | |
tree | ba60175e6a70743215ad0330c51b2462c2c4a082 | |
parent | 8db7d2d6bdb92d3fcd35f4b35c420f1b8f87f0ac (diff) | |
parent | fdc9914c28355a09a55725b2cd1798446b76d615 (diff) |
Merge branch 'ja/worktree-orphan' into maint-2.42
Typofix in an error message.
* ja/worktree-orphan:
builtin/worktree.c: fix typo in "forgot fetch" msg
-rw-r--r-- | builtin/worktree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c index 4cd01842de..10db70b7ec 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -696,7 +696,7 @@ static int can_use_remote_refs(const struct add_opts *opts) return 1; } else if (!opts->force && remote_get(NULL)) { die(_("No local or remote refs exist despite at least one remote\n" - "present, stopping; use 'add -f' to overide or fetch a remote first")); + "present, stopping; use 'add -f' to override or fetch a remote first")); } return 0; } |