From: Junio C Hamano <junkio@cox.net>
Date: Fri, 3 Nov 2006 05:41:47 +0000 (-0800)
Subject: Merge branch 'sp/keep-pack' into np/index-pack
X-Git-Tag: v1.4.4-rc1~5^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aac91b7eeae4e8cf6521a5370caf03eb432ce492;p=git.git

Merge branch 'sp/keep-pack' into np/index-pack

* sp/keep-pack: (29 commits)
  Remove unused variable in receive-pack.
  Teach git-index-pack how to keep a pack file.
  Only repack active packs by skipping over kept packs.
  Allow short pack names to git-pack-objects --unpacked=.
  git-send-email: Read the default SMTP server from the GIT config file
  git-send-email: Document support for local sendmail instead of SMTP server
  Swap the porcelain and plumbing commands in the git man page
  Mention that pull can work locally in the synopsis
  gitweb: Add "next" link to commitdiff view
  gitweb: Move git_get_last_activity subroutine earlier
  Documentation: fix git-format-patch mark-up and link it from git.txt
  Documentation: Update information about <format> in git-for-each-ref
  Bash completion support for aliases
  gitweb: Fix up bogus $stylesheet declarations
  tests: merge-recursive is usable without Python
  gitweb: Check git base URLs before generating URL from it
  Documentation: add git in /etc/services.
  Documentation: add upload-archive service to git-daemon.
  git-cherry: document limit and add diagram
  diff-format.txt: Correct information about pathnames quoting in patch format
  ...
---

aac91b7eeae4e8cf6521a5370caf03eb432ce492