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"

diff --cc Documentation/git-rev-list.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc builtin-apply.c
Simple merge

diff --cc builtin-rev-list.c
index f91685a4067630b49e6d9235f29ab8f8060faf66,b86e7ca8b18c7d11886dd3a1b4ca0eba95af264a..09774f9559b81050d89bd6663b8b672438da4342
--- 1/builtin-rev-list.c
--- 2/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@@ -35,9 -35,9 +35,10 @@@ static const char rev_list_usage[] 
  "    --header | --pretty\n"
  "    --abbrev=nr | --no-abbrev\n"
  "    --abbrev-commit\n"
+ "    --left-right\n"
  "  special purpose:\n"
 -"    --bisect"
 +"    --bisect\n"
 +"    --bisect-vars"
  ;
  
  static struct rev_info revs;

diff --cc gitweb/gitweb.perl
Simple merge