From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2017 21:57:18 +0000 (-0800)
Subject: Merge branch 'rl/remote-allow-missing-branch-name-merge'
X-Git-Tag: v2.13.0-rc0~154
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e5c63943d35be1804d302c0393affc4916c3dc3;p=thirdparty%2Fgit.git

Merge branch 'rl/remote-allow-missing-branch-name-merge'

"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.<name>.merge
---

3e5c63943d35be1804d302c0393affc4916c3dc3