summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2007-01-14 02:44:18 -0500
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2007-01-14 02:44:18 -0500
commit1fcdd62adf81a172f45c7c6a58177212d500b9d9 (patch)
tree94acde078fd78c3d214fe09d45e85ed346a2f2d4 /.gitignore
parentAllow creating branches without committing in fast-import. (diff)
parentgit-commit documentation: -a adds and also removes (diff)
downloadtgif-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 '.gitignore')
-rw-r--r--.gitignore17
1 files changed, 15 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 8ddccd7dac..a9dc462cb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,16 @@ GIT-CFLAGS
GIT-VERSION-FILE
git
git-add
+git-add--interactive
git-am
git-annotate
git-apply
git-applymbox
git-applypatch
git-archimport
+git-archive
git-bisect
+git-blame
git-branch
git-cat-file
git-check-ref-format
@@ -37,8 +40,10 @@ git-fetch
git-fetch-pack
git-findtags
git-fmt-merge-msg
+git-for-each-ref
git-format-patch
git-fsck-objects
+git-gc
git-get-tar-commit-id
git-grep
git-hash-object
@@ -46,6 +51,7 @@ git-http-fetch
git-http-push
git-imap-send
git-index-pack
+git-init
git-init-db
git-instaweb
git-local-fetch
@@ -59,10 +65,12 @@ git-mailsplit
git-merge
git-merge-base
git-merge-index
+git-merge-file
git-merge-tree
git-merge-octopus
git-merge-one-file
git-merge-ours
+git-merge-recur
git-merge-recursive
git-merge-resolve
git-merge-stupid
@@ -72,6 +80,7 @@ git-name-rev
git-mv
git-pack-redundant
git-pack-objects
+git-pack-refs
git-parse-remote
git-patch-id
git-peek-remote
@@ -83,7 +92,9 @@ git-quiltimport
git-read-tree
git-rebase
git-receive-pack
+git-reflog
git-relink
+git-remote
git-repack
git-repo-config
git-request-pull
@@ -94,6 +105,7 @@ git-rev-list
git-rev-parse
git-revert
git-rm
+git-runstatus
git-send-email
git-send-pack
git-sh-setup
@@ -102,6 +114,7 @@ git-shortlog
git-show
git-show-branch
git-show-index
+git-show-ref
git-ssh-fetch
git-ssh-pull
git-ssh-push
@@ -118,8 +131,8 @@ git-unpack-objects
git-update-index
git-update-ref
git-update-server-info
+git-upload-archive
git-upload-pack
-git-upload-tar
git-var
git-verify-pack
git-verify-tag
@@ -140,9 +153,9 @@ git-core.spec
*.py[co]
config.mak
autom4te.cache
+config.cache
config.log
config.status
config.mak.autogen
config.mak.append
configure
-git-blame