Merge branch 'maint'
commit77e6f5bc1009aa588a3b2235758bf5be13b23d85
authorJunio C Hamano <junkio@cox.net>
Thu, 5 Apr 2007 23:34:51 +0000 (5 16:34 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 5 Apr 2007 23:34:51 +0000 (5 16:34 -0700)
treecb040ac72459291eda6adf1aa9f10778bc54cdbf
parent33580fbd308593e36395926fd35b501976ad322a
parentb5da24679ec73f458988523dce9dd17b4e9b0e02
Merge branch 'maint'

* maint:
  Fix lseek(2) calls with args 2 and 3 swapped
  Honor -p<n> when applying git diffs
  Fix dependency of common-cmds.h
  Fix renaming branch without config file
  DESTDIR support for git/contrib/emacs
  gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches
  Document --left-right option to rev-list.
  Revert "builtin-archive: use RUN_SETUP"
  rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.
  rerere: make sorting really stable.
  Fix t4200-rerere for white-space from "wc -l"
Documentation/git-rev-list.txt
Makefile
builtin-apply.c
builtin-rev-list.c
gitweb/gitweb.perl