diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-01-03 14:09:28 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-01-03 14:09:28 -0800 |
commit | 4570aeb0d85f3b5ff274b6d5a651c2ee06d25d76 (patch) | |
tree | 1843b8f495d86a112ef041195dbf0053ecc858e2 /contrib/examples/git-merge.sh | |
parent | Merge branch 'maint' (diff) | |
parent | git-p4: document and test submit options (diff) | |
download | tgif-4570aeb0d85f3b5ff274b6d5a651c2ee06d25d76.tar.xz |
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
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions