From: Junio C Hamano Date: Tue, 21 Mar 2017 22:03:28 +0000 (-0700) Subject: Merge branch 'rl/remote-allow-missing-branch-name-merge' into maint X-Git-Tag: v2.12.2~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d9f9424ad12c8e9e71db45776f6bf4a143b90f3;p=thirdparty%2Fgit.git Merge branch 'rl/remote-allow-missing-branch-name-merge' into maint "git remote rm X", when a branch has remote X configured as the value of its branch.*.remote, tried to remove branch.*.remote and branch.*.merge and failed if either is unset. * rl/remote-allow-missing-branch-name-merge: remote: ignore failure to remove missing branch..merge --- 0d9f9424ad12c8e9e71db45776f6bf4a143b90f3