| commit | 3e5c63943d35be1804d302c0393affc4916c3dc3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Feb 2017 21:57:18 +0000 (27 13:57 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Feb 2017 21:57:18 +0000 (27 13:57 -0800) | ||
| tree | 1a6c6eff3113d5e6b0e5d78cf45b59a3c75a4a6b | treesnapshot (tar.gz zip) |
| parent | c13c783c9d3d7d3eff937b7bf3642d2a7fe32644 | commitdiff |
| parent | 20690b213975ad3e9b1bc851f434d818bd2d1de9 | commitdiff |
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
"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
| builtin/remote.c | diff1 | diff2 | blobhistory |
| t/t5505-remote.sh | diff1 | diff2 | blobhistory |