| commit | 76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 30 Jan 2007 16:07:24 +0000 (30 11:07 -0500) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 30 Jan 2007 16:07:24 +0000 (30 11:07 -0500) | ||
| tree | 80a6b54d21978b5c3879662bdc4f5951f804b808 | treesnapshot (tar.gz zip) |
| parent | b715cfbba4083d25ec0d0f94e440ad734607ddb0 | commitdiff |
| parent | 73a2acc0a09829f887fdf2dbcfba217102227932 | commitdiff |
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
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
| .gitignore | diff1 | diff2 | blobhistory |
| Makefile | diff1 | diff2 | blobhistory |
| fast-import.c | diff1 | blobhistory |