summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-01-30 16:07:24 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-01-30 16:07:24 (GMT)
commit76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a (patch)
tree80a6b54d21978b5c3879662bdc4f5951f804b808 /.gitignore
parentb715cfbba4083d25ec0d0f94e440ad734607ddb0 (diff)
parent73a2acc0a09829f887fdf2dbcfba217102227932 (diff)
downloadgit-76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a.zip
git-76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a.tar.gz
git-76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a.tar.bz2
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 '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a9dc462..d499949 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ git-clean
git-clone
git-commit
git-commit-tree
+git-config
git-convert-objects
git-count-objects
git-cvsexportcommit
@@ -42,6 +43,7 @@ git-findtags
git-fmt-merge-msg
git-for-each-ref
git-format-patch
+git-fsck
git-fsck-objects
git-gc
git-get-tar-commit-id