From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Aug 2009 23:15:55 +0000 (-0700)
Subject: Merge branch 'maint-1.6.3' into maint
X-Git-Tag: v1.6.4.1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe;p=thirdparty%2Fgit.git

Merge branch 'maint-1.6.3' into maint

* maint-1.6.3:
  Change mentions of "git programs" to "git commands"
  Documentation: merge: one <remote> is required
  help.c: give correct structure's size to memset()
---

2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe