From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Oct 2010 03:21:24 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~192
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aa2fac1bf72f06a49fc41db96b7985f88fec9617;p=git.git

Merge branch 'master' into next

* master:
  Better advice on using topic branches for kernel development
  Documentation: update implicit "--no-index" behavior in "git diff"
  Documentation: expand 'git diff' SEE ALSO section
  Documentation: diff can compare blobs
  Documentation: gitrevisions is in section 7
  fast-import: Allow filemodify to set the root
  shell portability: no "export VAR=VAL"
  CodingGuidelines: reword parameter expansion section
  Documentation: update-index: -z applies also to --index-info
  gitweb: Improve behavior for actionless path_info gitweb URLs
  gitweb: Fix bug in evaluate_path_info
  gitweb: Fix test of highlighting support in t9500
  t5503: fix typo
  Documentation: No argument of ALLOC_GROW should have side-effects
  commit-tree: free commit message before exiting
---

aa2fac1bf72f06a49fc41db96b7985f88fec9617