diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-13 23:36:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-13 23:36:03 -0700 |
| commit | 551029af305e04bed638771a3932e376243dddcb (patch) | |
| tree | 4e9159e7921a182c37f0fdf4f2c7e3c2e0f93765 /merge-tree.c | |
| parent | 1718aab3e434575f3faef0afd3c66552e42f178f (diff) | |
| parent | 883653babd8ee7ea23e6a5c392bb739348b1eb61 (diff) | |
| parent | 5df1e0d05cc42aeef9bf2fce243375fb6dac2121 (diff) | |
| download | git-551029af305e04bed638771a3932e376243dddcb.tar.gz git-551029af305e04bed638771a3932e376243dddcb.tar.xz | |
Merge branches 'maint' and 'jc/http'
* maint:
http-fetch: fix alternates handling.
* jc/http:
http-fetch: fix alternates handling.