From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Jan 2012 22:09:28 +0000 (-0800)
Subject: Merge branch 'pw/p4-docs-and-tests'
X-Git-Tag: v1.7.9-rc0~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4570aeb0d85f3b5ff274b6d5a651c2ee06d25d76;p=git.git

Merge branch 'pw/p4-docs-and-tests'

* pw/p4-docs-and-tests:
  git-p4: document and test submit options
  git-p4: test and document --use-client-spec
  git-p4: test --keep-path
  git-p4: test --max-changes
  git-p4: document and test --import-local
  git-p4: honor --changesfile option and test
  git-p4: document and test clone --branch
  git-p4: test cloning with two dirs, clarify doc
  git-p4: clone does not use --git-dir
  git-p4: introduce asciidoc documentation
  rename git-p4 tests
---

4570aeb0d85f3b5ff274b6d5a651c2ee06d25d76