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-log.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-log.txt')
| -rw-r--r-- | Documentation/git-log.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index c9ffff734c..e9f746bbd4 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -24,14 +24,16 @@ This manual page describes only the most frequently used options. OPTIONS ------- ---pretty=<format>:: - Controls the way the commit log is formatted. + +include::pretty-formats.txt[] --max-count=<n>:: Limits the number of commits to show. <since>..<until>:: - Show only commits between the named two commits. + Show only commits between the named two commits. When + either <since> or <until> is omitted, it defaults to + `HEAD`, i.e. the tip of the current branch. -p:: Show the change the commit introduces in a patch form. @@ -63,6 +65,12 @@ git log -r --name-status release..test:: in the "release" branch, along with the list of paths each commit modifies. +Discussion +---------- + +include::i18n.txt[] + + Author ------ Written by Linus Torvalds <torvalds@osdl.org> |