builtin/fetch.c: ignore merge config when not fetching from branch's remote
[git/jnareb-git/bp-gitweb.git] / .gitignore
blob561401b2b5cab632afad901c3b886545a3ddd405
1 /GIT-BUILD-OPTIONS
2 /GIT-CFLAGS
3 /GIT-GUI-VARS
4 /GIT-VERSION-FILE
5 /bin-wrappers/
6 /git
7 /git-add
8 /git-add--interactive
9 /git-am
10 /git-annotate
11 /git-apply
12 /git-archimport
13 /git-archive
14 /git-bisect
15 /git-bisect--helper
16 /git-blame
17 /git-branch
18 /git-bundle
19 /git-cat-file
20 /git-check-attr
21 /git-check-ref-format
22 /git-checkout
23 /git-checkout-index
24 /git-cherry
25 /git-cherry-pick
26 /git-clean
27 /git-clone
28 /git-commit
29 /git-commit-tree
30 /git-config
31 /git-count-objects
32 /git-cvsexportcommit
33 /git-cvsimport
34 /git-cvsserver
35 /git-daemon
36 /git-diff
37 /git-diff-files
38 /git-diff-index
39 /git-diff-tree
40 /git-difftool
41 /git-difftool--helper
42 /git-describe
43 /git-fast-export
44 /git-fast-import
45 /git-fetch
46 /git-fetch--tool
47 /git-fetch-pack
48 /git-filter-branch
49 /git-fmt-merge-msg
50 /git-for-each-ref
51 /git-format-patch
52 /git-fsck
53 /git-fsck-objects
54 /git-gc
55 /git-get-tar-commit-id
56 /git-grep
57 /git-hash-object
58 /git-help
59 /git-http-backend
60 /git-http-fetch
61 /git-http-push
62 /git-imap-send
63 /git-index-pack
64 /git-init
65 /git-init-db
66 /git-instaweb
67 /git-log
68 /git-lost-found
69 /git-ls-files
70 /git-ls-remote
71 /git-ls-tree
72 /git-mailinfo
73 /git-mailsplit
74 /git-merge
75 /git-merge-base
76 /git-merge-index
77 /git-merge-file
78 /git-merge-tree
79 /git-merge-octopus
80 /git-merge-one-file
81 /git-merge-ours
82 /git-merge-recursive
83 /git-merge-resolve
84 /git-merge-subtree
85 /git-mergetool
86 /git-mergetool--lib
87 /git-mktag
88 /git-mktree
89 /git-name-rev
90 /git-mv
91 /git-notes
92 /git-pack-redundant
93 /git-pack-objects
94 /git-pack-refs
95 /git-parse-remote
96 /git-patch-id
97 /git-peek-remote
98 /git-prune
99 /git-prune-packed
100 /git-pull
101 /git-push
102 /git-quiltimport
103 /git-read-tree
104 /git-rebase
105 /git-rebase--interactive
106 /git-receive-pack
107 /git-reflog
108 /git-relink
109 /git-remote
110 /git-remote-curl
111 /git-remote-http
112 /git-remote-https
113 /git-remote-ftp
114 /git-remote-ftps
115 /git-repack
116 /git-replace
117 /git-repo-config
118 /git-request-pull
119 /git-rerere
120 /git-reset
121 /git-rev-list
122 /git-rev-parse
123 /git-revert
124 /git-rm
125 /git-send-email
126 /git-send-pack
127 /git-sh-setup
128 /git-shell
129 /git-shortlog
130 /git-show
131 /git-show-branch
132 /git-show-index
133 /git-show-ref
134 /git-stage
135 /git-stash
136 /git-status
137 /git-stripspace
138 /git-submodule
139 /git-svn
140 /git-symbolic-ref
141 /git-tag
142 /git-tar-tree
143 /git-unpack-file
144 /git-unpack-objects
145 /git-update-index
146 /git-update-ref
147 /git-update-server-info
148 /git-upload-archive
149 /git-upload-pack
150 /git-var
151 /git-verify-pack
152 /git-verify-tag
153 /git-web--browse
154 /git-whatchanged
155 /git-write-tree
156 /git-core-*/?*
157 /gitk-git/gitk-wish
158 /gitweb/gitweb.cgi
159 /gitweb/gitweb.min.*
160 /test-chmtime
161 /test-ctype
162 /test-date
163 /test-delta
164 /test-dump-cache-tree
165 /test-genrandom
166 /test-index-version
167 /test-match-trees
168 /test-parse-options
169 /test-path-utils
170 /test-run-command
171 /test-sha1
172 /test-sigchain
173 /common-cmds.h
174 *.tar.gz
175 *.dsc
176 *.deb
177 /git.spec
178 *.exe
179 *.[aos]
180 *.py[co]
181 .depend/
183 /config.mak
184 /autom4te.cache
185 /config.cache
186 /config.log
187 /config.status
188 /config.mak.autogen
189 /config.mak.append
190 /configure
191 /tags
192 /TAGS
193 /cscope*
194 *.obj
195 *.lib
196 *.sln
197 *.suo
198 *.ncb
199 *.vcproj
200 *.user
201 *.idb
202 *.pdb
203 /Debug/
204 /Release/