diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-01-14 02:44:18 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-14 02:44:18 -0500 |
| commit | 1fcdd62adf81a172f45c7c6a58177212d500b9d9 (patch) | |
| tree | 94acde078fd78c3d214fe09d45e85ed346a2f2d4 /Documentation/git-applymbox.txt | |
| parent | Allow creating branches without committing in fast-import. (diff) | |
| parent | git-commit documentation: -a adds and also removes (diff) | |
| download | tgif-1fcdd62adf81a172f45c7c6a58177212d500b9d9.tar.xz | |
Merge branch 'master' into sp/fast-import
I'm bringing master in early so that the OBJ_OFS_DELTA implementation
is available as part of the topic. This way git-fast-import can
learn about this new slightly smaller and faster packfile format,
and can generate them directly rather than needing to have them be
repacked with git-pack-objects.
Due to the API changes in master during the period of development
of git-fast-import, a few minor tweaks to fast-import.c are needed
to produce a working merge. I've done them here as part of the
merge to ensure bisection always works.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/git-applymbox.txt')
| -rw-r--r-- | Documentation/git-applymbox.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt index f74c6a49b3..95dc65a583 100644 --- a/Documentation/git-applymbox.txt +++ b/Documentation/git-applymbox.txt @@ -42,13 +42,13 @@ OPTIONS and the current tree. -u:: - By default, the commit log message, author name and - author email are taken from the e-mail without any - charset conversion, after minimally decoding MIME - transfer encoding. This flag causes the resulting - commit to be encoded in utf-8 by transliterating them. - Note that the patch is always used as is without charset - conversion, even with this flag. + The commit log message, author name and author email are + taken from the e-mail, and after minimally decoding MIME + transfer encoding, re-coded in UTF-8 by transliterating + them. This used to be optional but now it is the default. ++ +Note that the patch is always used as-is without charset +conversion, even with this flag. -c .dotest/<num>:: When the patch contained in an e-mail does not cleanly |