summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-09 21:27:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-09 21:27:11 (GMT)
commita5e10f8bc1db418fc806abb7574bb1e468948d19 (patch)
tree7b16be6b855c74eaa6534fa758f41d784ba2b846 /diff-lib.c
parentbd5424f0d6257b55f7269ee5f009c5ce5eb71c6e (diff)
parent737c5a9cde708d6995c765b7c2e95033edd0a896 (diff)
downloadgit-a5e10f8bc1db418fc806abb7574bb1e468948d19.zip
git-a5e10f8bc1db418fc806abb7574bb1e468948d19.tar.gz
git-a5e10f8bc1db418fc806abb7574bb1e468948d19.tar.bz2
Merge branch 'ms/fetch-prune-configuration'
Allow fetch.prune and remote.*.prune configuration variables to be set, and "git fetch" to behave as if "--prune" is given. "git fetch" that honors remote.*.prune is fine, but I wonder if we should somehow make "git push" aware of it as well. Perhaps remote.*.prune should not be just a boolean, but a 4-way "none", "push", "fetch", "both"? * ms/fetch-prune-configuration: fetch: make --prune configurable
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions