summaryrefslogtreecommitdiff
path: root/list-objects.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-10 10:32:50 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-10 10:32:50 -0800
commit666b4c2670f013bc1747f1db9b72a4b25266cec2 (patch)
tree2e8d29034a9b3b8ce3e114add1062e1677a558f6 /list-objects.h
parent2da5cbd651114569b1a25d9b73c0e2afffb30aa7 (diff)
parent10a6cc8890ec1e5459c05ddeb28a671acdc37d60 (diff)
downloadgit-666b4c2670f013bc1747f1db9b72a4b25266cec2.tar.gz
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
Diffstat (limited to 'list-objects.h')
0 files changed, 0 insertions, 0 deletions