]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d30ec1b 20690b2)
Merge branch 'rl/remote-allow-missing-branch-name-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:03:28 +0000 (15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:03:28 +0000 (15:03 -0700)
commit0d9f9424ad12c8e9e71db45776f6bf4a143b90f3
tree91cc0d2c5d178f32beb6376a2364f40d255b4798tree | snapshot
parentd30ec1bece7f56080bac3e5a9f8dbc9f80508fdbcommit | diff
parent20690b213975ad3e9b1bc851f434d818bd2d1de9commit | diff
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
builtin/remote.c diff1 | diff2 | blob | history
t/t5505-remote.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.