diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:18 -0800 |
| commit | 3e5c63943d35be1804d302c0393affc4916c3dc3 (patch) | |
| tree | 1a6c6eff3113d5e6b0e5d78cf45b59a3c75a4a6b /mergetools/p4merge | |
| parent | Merge branch 'km/delete-ref-reflog-message' (diff) | |
| parent | remote: ignore failure to remove missing branch.<name>.merge (diff) | |
| download | tgif-3e5c63943d35be1804d302c0393affc4916c3dc3.tar.xz | |
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
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions