Junio C Hamano 5e4d4957e1 Merge branch 'master' into sp/darwin ...

* master: (176 commits)
  upload-pack: fix timeout in create_pack_file
  Defaulting fetch to origin when set in the repo-config
  Colorize 'commit' lines in log ui
  git-am: Don't accept an mbox on stdin of we already have a .dotest directory
  show-branch: Fix another performance problem.
  pack-objects: check pack.window for default window size
  Disable linking with Fink or DarwinPorts.
  git.el: Put the git customize group in the 'tools' parent group.
  git.el: Try to reuse an existing buffer when running git-status.
  git.el: Prepend a slash to the file name when adding to .gitignore.
  git.el: Run git-rerere on commits if the rr-cache directory exists.
  git-svn: fix fetching new directories copies when using SVN:: libs
  tar-tree: add the "tar.umask" config option
  cvsexportcommit - add -a (add author line) flag, cleanup warnings
  unpack-objects: remove stale and confusing comment
  git-fetch: fix --keep vs --thin
  git-svn: don't check for migrations/upgrades on commit-diff
  show-branch: fix performance problem.
  Documentation/urls.txt: Use substitution to escape square brackets
  Documentation/Makefile: product depends on asciidoc.conf
  ...

2006-07-24 01:04:58 -07:00

23 KiB

Raw Blame History

View Raw