diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-06-02 13:35:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-02 13:35:05 -0700 |
| commit | 54041832d7d2a20c26bdf8eeb8aeb475024ef8d5 (patch) | |
| tree | 1dda599db11cbf7dd4b1623bb14a7290cb71bf15 /Documentation/git-fast-import.txt | |
| parent | a0ba2bbbdd9c5b44ae49910bc774aced87f89771 (diff) | |
| parent | d42a2fb72f8cbe6efd60a4f90c8e9ec1c888c3a7 (diff) | |
| download | git-54041832d7d2a20c26bdf8eeb8aeb475024ef8d5.tar.gz | |
Merge branch 'en/fast-import-looser-date'
Some repositories in the wild have commits that record nonsense
committer timezone (e.g. rails.git); "git fast-import" learned an
option to pass these nonsense timestamps intact to allow recreating
existing repositories as-is.
* en/fast-import-looser-date:
fast-import: add new --date-format=raw-permissive format
Diffstat (limited to 'Documentation/git-fast-import.txt')
| -rw-r--r-- | Documentation/git-fast-import.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 77c6b3d001..7d9aad2a7e 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -293,7 +293,14 @@ by users who are located in the same location and time zone. In this case a reasonable offset from UTC could be assumed. + Unlike the `rfc2822` format, this format is very strict. Any -variation in formatting will cause fast-import to reject the value. +variation in formatting will cause fast-import to reject the value, +and some sanity checks on the numeric values may also be performed. + +`raw-permissive`:: + This is the same as `raw` except that no sanity checks on + the numeric epoch and local offset are performed. This can + be useful when trying to filter or import an existing history + with e.g. bogus timezone values. `rfc2822`:: This is the standard email format as described by RFC 2822. |