From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Oct 2013 20:32:50 +0000 (-0700)
Subject: Merge branch 'jh/checkout-auto-tracking' into maint
X-Git-Tag: v1.8.4.2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74051fa805b2b4aa6a0c2e6d4663dc8969e80967;p=thirdparty%2Fgit.git

Merge branch 'jh/checkout-auto-tracking' into maint

"git branch --track" had a minor regression in v1.8.3.2 and later
that made it impossible to base your local work on anything but a
local branch of the upstream repository you are tracking from.

* jh/checkout-auto-tracking:
  t3200: fix failure on case-insensitive filesystems
  branch.c: Relax unnecessary requirement on upstream's remote ref name
  t3200: Add test demonstrating minor regression in 41c21f2
  Refer to branch.<name>.remote/merge when documenting --track
  t3200: Minor fix when preparing for tracking failure
  t2024: Fix &&-chaining and a couple of typos
---

74051fa805b2b4aa6a0c2e6d4663dc8969e80967