From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Oct 2010 03:20:09 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~176
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=38a18873b21f6f2eebedc65aff2249fd6ec2168c;p=git.git

Merge branch 'maint'

* maint:
  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
  shell portability: no "export VAR=VAL"
  CodingGuidelines: reword parameter expansion section
  Documentation: update-index: -z applies also to --index-info
  Documentation: No argument of ALLOC_GROW should have side-effects
---

38a18873b21f6f2eebedc65aff2249fd6ec2168c