diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-01-31 23:04:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-01-31 23:04:31 +0000 |
| commit | 167b1384c594ba1ce67e6aae4e4c3cfb304bf025 (patch) | |
| tree | 31e32edd1f8c3544e90e2768653cffa0be026cf1 /git-fast-import.txt | |
| parent | 197c229dba62a22dd8e42d6fc026a00de2944081 (diff) | |
| download | git-htmldocs-167b1384c594ba1ce67e6aae4e4c3cfb304bf025.tar.gz | |
Autogenerated HTML docs for v1.7.0-rc1-7-gc0da5
Diffstat (limited to 'git-fast-import.txt')
| -rw-r--r-- | git-fast-import.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt index ff4022c15..fa7d2fe14 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -152,7 +152,7 @@ fast-forward update, fast-import will skip updating that ref and instead prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure. -Branch updates can be forced with \--force, but its recommended that +Branch updates can be forced with \--force, but it's recommended that this only be used on an otherwise quiet repository. Using \--force is not necessary for an initial import into an empty repository. @@ -267,7 +267,7 @@ is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or timezone. + -This particular format is supplied as its short to implement and +This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'. @@ -420,7 +420,7 @@ quoting or escaping syntax is supported within `<committish>`. Here `<committish>` is any of the following: * The name of an existing branch already in fast-import's internal branch - table. If fast-import doesn't know the name, its treated as a SHA-1 + table. If fast-import doesn't know the name, it's treated as a SHA-1 expression. * A mark reference, `:<idnum>`, where `<idnum>` is the mark number. @@ -759,7 +759,7 @@ assigned mark. The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that -directly to `commit`. This is typically more work than its worth +directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use. `data` |