Merge branch 'jc/fetch-auto-keep' into next
commita4cc3e5d97451239a6868948415ca0a6cb071527
authorJunio C Hamano <junkio@cox.net>
Thu, 25 Jan 2007 02:08:12 +0000 (24 18:08 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 25 Jan 2007 02:08:12 +0000 (24 18:08 -0800)
tree8c39e8aa3029b5b27a68b7ea94ea65bd8564d8a0
parent81688d70a9740bb5ed87b029bbc2bb7a6c0c7384
parente28714c527339a477fca226765163b9361d94285
Merge branch 'jc/fetch-auto-keep' into next

* jc/fetch-auto-keep:
  Consolidate {receive,fetch}.unpackLimit
  fetch-pack: remove --keep-auto and make it the default.
  Allow fetch-pack to decide keeping the fetched pack without exploding
  Refactor the pack header reading function out of receive-pack.c
  Allow default core.logallrefupdates to be overridden with template's config
  ls-remote and clone: accept --upload-pack=<path> as well.
  rename --exec to --upload-pack for fetch-pack and peek-remote
  Documentation: --amend cannot be combined with -c/-C/-F.
  Documentation/config.txt: Correct info about subsection name
  git-daemon documentation on enabling services.
  reflog inspection: introduce shortcut "-g"
  annotate: use pager
  t/t1300-repo-config.sh: value continued on next line
  git-checkout -m: fix merge case
Documentation/git-rev-list.txt
git-checkout.sh
git.c
receive-pack.c
revision.c