projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jk/rebase-i-comment-char'
[git.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 726db73450189ccd1ab6975ba9ca872f53a79c44..6669bf0c6c9a0b42f74e2ed189350a6a9f11f17d 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,7
+1,6
@@
/GIT-BUILD-OPTIONS
/GIT-CFLAGS
/GIT-LDFLAGS
/GIT-BUILD-OPTIONS
/GIT-CFLAGS
/GIT-LDFLAGS
-/GIT-GUI-VARS
/GIT-PREFIX
/GIT-PYTHON-VARS
/GIT-SCRIPT-DEFINES
/GIT-PREFIX
/GIT-PYTHON-VARS
/GIT-SCRIPT-DEFINES
@@
-23,6
+22,7
@@
/git-bundle
/git-cat-file
/git-check-attr
/git-bundle
/git-cat-file
/git-check-attr
+/git-check-ignore
/git-check-ref-format
/git-checkout
/git-checkout-index
/git-check-ref-format
/git-checkout
/git-checkout-index
@@
-125,7
+125,7
@@
/git-remote-ftps
/git-remote-fd
/git-remote-ext
/git-remote-ftps
/git-remote-fd
/git-remote-ext
-/git-remote-test
git
+/git-remote-test
py
/git-remote-testsvn
/git-repack
/git-replace
/git-remote-testsvn
/git-repack
/git-replace
@@
-172,7
+172,6
@@
/git-whatchanged
/git-write-tree
/git-core-*/?*
/git-whatchanged
/git-write-tree
/git-core-*/?*
-/gitk-git/gitk-wish
/gitweb/GITWEB-BUILD-OPTIONS
/gitweb/gitweb.cgi
/gitweb/static/gitweb.js
/gitweb/GITWEB-BUILD-OPTIONS
/gitweb/gitweb.cgi
/gitweb/static/gitweb.js
@@
-199,6
+198,7
@@
/test-string-list
/test-subprocess
/test-svn-fe
/test-string-list
/test-subprocess
/test-svn-fe
+/test-wildmatch
/common-cmds.h
*.tar.gz
*.dsc
/common-cmds.h
*.tar.gz
*.dsc