author | Junio C Hamano <gitster@pobox.com> | |
Thu, 14 Oct 2010 03:20:09 +0000 (20:20 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 14 Oct 2010 03:20:09 +0000 (20:20 -0700) | ||
commit | 38a18873b21f6f2eebedc65aff2249fd6ec2168c | |
tree | 5f7d8cce901a2317a8fbdef7bce2fb85742be1fc | tree | snapshot |
parent | 2794ad524462c4e2ecd4573d650e7b4f8da89a5d | commit | diff |
parent | 352953a556e7f8d720e26a32d4aabbf823d3c4d4 | commit | diff |
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
* 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