diff options
author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-30 15:08:10 +0100 |
---|---|---|
committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-30 15:08:10 +0100 |
commit | 43efcf42382e87de4aa423e5e1607958ad1717d0 (patch) | |
tree | 7e19a0765b0dd6885fbdf69d3a8d0159a1b42de8 /.gitignore | |
parent | 45d74c4b0fe38218b4569a90da7102cf48d616c2 (diff) | |
parent | c7fd06b6411fb04eb4d9acd7f8822a288a50dc17 (diff) | |
download | git-43efcf42382e87de4aa423e5e1607958ad1717d0.tar.gz |
Merge branch 'baserock/jonathanmaw/S9007/upgrade-git' into baserock/morphbaserock/morph
Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Reviewed-by: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 3b7680ea1e..6b1fd1bfb0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,10 @@ /GIT-BUILD-OPTIONS /GIT-CFLAGS /GIT-LDFLAGS -/GIT-GUI-VARS +/GIT-PREFIX +/GIT-PYTHON-VARS +/GIT-SCRIPT-DEFINES +/GIT-USER-AGENT /GIT-VERSION-FILE /bin-wrappers/ /git @@ -19,6 +22,8 @@ /git-bundle /git-cat-file /git-check-attr +/git-check-ignore +/git-check-mailmap /git-check-ref-format /git-checkout /git-checkout-index @@ -26,10 +31,12 @@ /git-cherry-pick /git-clean /git-clone +/git-column /git-commit /git-commit-tree /git-config /git-count-objects +/git-credential /git-credential-cache /git-credential-cache--daemon /git-credential-store @@ -92,6 +99,7 @@ /git-name-rev /git-mv /git-notes +/git-p4 /git-pack-redundant /git-pack-objects /git-pack-refs @@ -119,6 +127,8 @@ /git-remote-fd /git-remote-ext /git-remote-testgit +/git-remote-testpy +/git-remote-testsvn /git-repack /git-replace /git-repo-config @@ -164,13 +174,11 @@ /git-whatchanged /git-write-tree /git-core-*/?* -/gitk-git/gitk-wish /gitweb/GITWEB-BUILD-OPTIONS /gitweb/gitweb.cgi /gitweb/static/gitweb.js /gitweb/static/gitweb.min.* /test-chmtime -/test-credential /test-ctype /test-date /test-delta @@ -180,17 +188,21 @@ /test-index-version /test-line-buffer /test-match-trees +/test-mergesort /test-mktemp -/test-obj-pool /test-parse-options /test-path-utils +/test-prio-queue +/test-read-cache +/test-regex +/test-revision-walking /test-run-command /test-sha1 /test-sigchain -/test-string-pool +/test-string-list /test-subprocess /test-svn-fe -/test-treap +/test-wildmatch /common-cmds.h *.tar.gz *.dsc @@ -220,6 +232,7 @@ /cscope* *.obj *.lib +*.res *.sln *.suo *.ncb |