diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 11:07:24 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 11:07:24 -0500 |
| commit | 76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a (patch) | |
| tree | 80a6b54d21978b5c3879662bdc4f5951f804b808 /Documentation/git-whatchanged.txt | |
| parent | Accept 'inline' file data in fast-import commit structure. (diff) | |
| parent | blameview: Use git-cat-file to read the file content. (diff) | |
| download | tgif-76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a.tar.xz | |
Merge branch 'master' into sp/gfi
git-fast-import requires use of inttypes.h, but the master branch has
added it to git-compat-util differently than git-fast-import originally
had used it. This merge back of master to the fast-import topic is to
get (and use) inttypes.h the way master is using it.
This is a partially evil merge to remove the call to setup_ident(),
as the master branch now contains a change which makes this implicit
and therefore removed the function declaration. (commit 01754769).
Conflicts:
git-compat-util.h
Diffstat (limited to 'Documentation/git-whatchanged.txt')
| -rw-r--r-- | Documentation/git-whatchanged.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt index e8f21d02f7..399bff3bbc 100644 --- a/Documentation/git-whatchanged.txt +++ b/Documentation/git-whatchanged.txt @@ -27,7 +27,7 @@ OPTIONS output format that is useful only to tell the changed paths and their nature of changes. ---max-count=<n>:: +-<n>:: Limit output to <n> commits. <since>..<until>:: |