From: Junio C Hamano <junkio@cox.net>
Date: Sat, 26 Aug 2006 08:08:39 +0000 (-0700)
Subject: Merge branch 'master' into gl/web
X-Git-Tag: v1.4.3-rc1~168^2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b4c27c186f6282ead5d2af0cfd9b6015b011bc38;p=git.git

Merge branch 'master' into gl/web

* master: (34 commits)
  gitweb: git_annotate didn't expect negative numeric timezone
  git-svn: add the 'dcommit' command
  git-svn: recommend rebase for syncing against an SVN repo
  git-svn: establish new connections on commit after fork
  describe: fix off-by-one error in --abbrev=40 handling
  git-svn(1): improve asciidoc markup
  gitview.txt: improve asciidoc markup
  git(7): put the synopsis in a verse style paragraph
  gitk(1): expand the manpage to look less like a template
  git-blame(1): mention options in the synopsis and advertise pickaxe
  git-ls-remote(1): document --upload-pack
  git-apply(1): document missing options and improve existing ones
  update-index -g
  n is in fact unused, and is later shadowed.
  use name[len] in switch directly, instead of creating a shadowed variable.
  builtin-grep.c: remove unused debugging piece.
  remove ugly shadowing of loop indexes in subloops.
  missing 'static' keywords
  git_dir holds pointers to local strings, hence MUST be const.
  avoid to use error that shadows the function name, use err instead.
  ...
---

b4c27c186f6282ead5d2af0cfd9b6015b011bc38