From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Jan 2014 18:32:50 +0000 (-0800)
Subject: Merge branch 'tm/fetch-prune'
X-Git-Tag: v1.9-rc0~34
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/666b4c2670f013bc1747f1db9b72a4b25266cec2

Merge branch 'tm/fetch-prune'

Fetching 'frotz' branch with "git fetch", while having
'frotz/nitfol' remote-tracking branch from an earlier fetch, would
error out, primarily because the command has not been told to
remove anything on our side. In such a case, "git fetch --prune"
can be used to remove 'frotz/nitfol' to make room to fetch and
store 'frotz' remote-tracking branch.

* tm/fetch-prune:
fetch --prune: Run prune before fetching
fetch --prune: always print header url
---

666b4c2670f013bc1747f1db9b72a4b25266cec2