diff options
| author |  Bert Wesarg <bert.wesarg@googlemail.com> | 2020-02-01 10:34:09 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-02-10 10:52:10 -0800 |
| commit | b3fd6cbf29435f8b49a0a5d9f86236e00b084624 (patch) | |
| tree | 552b7f9bb784f8b0991126e93789a82393732c5a /builtin/merge.c | |
| parent | config: provide access to the current line number (diff) | |
| download | tgif-b3fd6cbf29435f8b49a0a5d9f86236e00b084624.tar.xz | |
remote rename/remove: gently handle remote.pushDefault config
When renaming a remote with
git remote rename X Y
git remote remove X
Git already renames or removes any branch.<name>.remote and
branch.<name>.pushRemote configurations if their value is X.
However remote.pushDefault needs a more gentle approach, as this may be
set in a non-repo configuration file. In such a case only a warning is
printed, such as:
warning: The global configuration remote.pushDefault in:
$HOME/.gitconfig:35
now names the non-existent remote origin
It is changed to remote.pushDefault = Y or removed when set in a repo
configuration though.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions