diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-14 05:20:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-14 05:20:09 +0200 |
| commit | 38a18873b21f6f2eebedc65aff2249fd6ec2168c (patch) | |
| tree | 5f7d8cce901a2317a8fbdef7bce2fb85742be1fc /Documentation/git-fast-import.txt | |
| parent | fast-import: Allow filemodify to set the root (diff) | |
| parent | Better advice on using topic branches for kernel development (diff) | |
| download | git-38a18873b21f6f2eebedc65aff2249fd6ec2168c.tar.xz git-38a18873b21f6f2eebedc65aff2249fd6ec2168c.zip | |
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
Diffstat (limited to 'Documentation/git-fast-import.txt')
| -rw-r--r-- | Documentation/git-fast-import.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 90a46665c9..5d0c245e38 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -439,7 +439,7 @@ Marks must be declared (via `mark`) before they can be used. * A complete 40 byte or abbreviated commit SHA-1 in hex. * Any valid Git SHA-1 expression that resolves to a commit. See - ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[1] for details. + ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details. The special case of restarting an incremental import from the current branch value should be written as: |