diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-26 17:13:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-26 17:39:04 -0800 |
| commit | 80809062452a65146d73ae483415acbc737fabf1 (patch) | |
| tree | d5b65e07896705f4dda05424a324fd455519d865 /Documentation/git-p4.txt | |
| parent | ba998d33e22d6fce4445af5834dc227609672501 (diff) | |
| parent | 62ed0728fe52312f270760187b3280bc51b6c2f0 (diff) | |
| download | git-80809062452a65146d73ae483415acbc737fabf1.tar.gz | |
Merge branch 'maint'
* maint:
Document accumulated fixes since 1.7.9.2
Git 1.7.8.5
grep -P: Fix matching ^ and $
am: don't infloop for an empty input file
rebase -m: only call "notes copy" when rewritten exists and is non-empty
git-p4: remove bash-ism in t9800
git-p4: remove bash-ism in t9809
git-p4: fix submit regression with clientSpec and subdir clone
git-p4: set useClientSpec variable on initial clone
Makefile: add thread-utils.h to LIB_H
Conflicts:
RelNotes
t/t9809-git-p4-client-view.sh
Diffstat (limited to 'Documentation/git-p4.txt')
| -rw-r--r-- | Documentation/git-p4.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 3fecefaea2..b7c7929716 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -303,9 +303,13 @@ CLIENT SPEC ----------- The p4 client specification is maintained with the 'p4 client' command and contains among other fields, a View that specifies how the depot -is mapped into the client repository. Git-p4 can consult the client -spec when given the '--use-client-spec' option or useClientSpec -variable. +is mapped into the client repository. The 'clone' and 'sync' commands +can consult the client spec when given the '--use-client-spec' option or +when the useClientSpec variable is true. After 'git p4 clone', the +useClientSpec variable is automatically set in the repository +configuration file. This allows future 'git p4 submit' commands to +work properly; the submit command looks only at the variable and does +not have a command-line option. The full syntax for a p4 view is documented in 'p4 help views'. Git-p4 knows only a subset of the view syntax. It understands multi-line |