| commit | 0d9f9424ad12c8e9e71db45776f6bf4a143b90f3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Mar 2017 22:03:28 +0000 (21 15:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Mar 2017 22:03:28 +0000 (21 15:03 -0700) | ||
| tree | 91cc0d2c5d178f32beb6376a2364f40d255b4798 | treesnapshot (tar.gz zip) |
| parent | d30ec1bece7f56080bac3e5a9f8dbc9f80508fdb | commitdiff |
| parent | 20690b213975ad3e9b1bc851f434d818bd2d1de9 | commitdiff |
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.<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 |