merge-recursive: honor diff.algorithm
[git/gitster.git] / .gitignore
blob8caf3700c2305de9d894cd64c6c8e6efd0ced26d
1 /fuzz_corpora
2 /GIT-BUILD-DIR
3 /GIT-BUILD-OPTIONS
4 /GIT-CFLAGS
5 /GIT-LDFLAGS
6 /GIT-PREFIX
7 /GIT-PERL-DEFINES
8 /GIT-PERL-HEADER
9 /GIT-PYTHON-VARS
10 /GIT-SCRIPT-DEFINES
11 /GIT-SPATCH-DEFINES
12 /GIT-USER-AGENT
13 /GIT-VERSION-FILE
14 /bin-wrappers/
15 /git
16 /git-add
17 /git-am
18 /git-annotate
19 /git-apply
20 /git-archimport
21 /git-archive
22 /git-bisect
23 /git-blame
24 /git-branch
25 /git-bugreport
26 /git-bundle
27 /git-cat-file
28 /git-check-attr
29 /git-check-ignore
30 /git-check-mailmap
31 /git-check-ref-format
32 /git-checkout
33 /git-checkout--worker
34 /git-checkout-index
35 /git-cherry
36 /git-cherry-pick
37 /git-clean
38 /git-clone
39 /git-column
40 /git-commit
41 /git-commit-graph
42 /git-commit-tree
43 /git-config
44 /git-count-objects
45 /git-credential
46 /git-credential-cache
47 /git-credential-cache--daemon
48 /git-credential-store
49 /git-cvsexportcommit
50 /git-cvsimport
51 /git-cvsserver
52 /git-daemon
53 /git-diagnose
54 /git-diff
55 /git-diff-files
56 /git-diff-index
57 /git-diff-tree
58 /git-difftool
59 /git-difftool--helper
60 /git-describe
61 /git-fast-export
62 /git-fast-import
63 /git-fetch
64 /git-fetch-pack
65 /git-filter-branch
66 /git-fmt-merge-msg
67 /git-for-each-ref
68 /git-for-each-repo
69 /git-format-patch
70 /git-fsck
71 /git-fsck-objects
72 /git-fsmonitor--daemon
73 /git-gc
74 /git-get-tar-commit-id
75 /git-grep
76 /git-hash-object
77 /git-help
78 /git-hook
79 /git-http-backend
80 /git-http-fetch
81 /git-http-push
82 /git-imap-send
83 /git-index-pack
84 /git-init
85 /git-init-db
86 /git-interpret-trailers
87 /git-instaweb
88 /git-log
89 /git-ls-files
90 /git-ls-remote
91 /git-ls-tree
92 /git-mailinfo
93 /git-mailsplit
94 /git-maintenance
95 /git-merge
96 /git-merge-base
97 /git-merge-index
98 /git-merge-file
99 /git-merge-tree
100 /git-merge-octopus
101 /git-merge-one-file
102 /git-merge-ours
103 /git-merge-recursive
104 /git-merge-resolve
105 /git-merge-subtree
106 /git-mergetool
107 /git-mergetool--lib
108 /git-mktag
109 /git-mktree
110 /git-multi-pack-index
111 /git-mv
112 /git-name-rev
113 /git-notes
114 /git-p4
115 /git-pack-redundant
116 /git-pack-objects
117 /git-pack-refs
118 /git-patch-id
119 /git-prune
120 /git-prune-packed
121 /git-pull
122 /git-push
123 /git-quiltimport
124 /git-range-diff
125 /git-read-tree
126 /git-rebase
127 /git-receive-pack
128 /git-reflog
129 /git-refs
130 /git-remote
131 /git-remote-http
132 /git-remote-https
133 /git-remote-ftp
134 /git-remote-ftps
135 /git-remote-fd
136 /git-remote-ext
137 /git-repack
138 /git-replace
139 /git-replay
140 /git-request-pull
141 /git-rerere
142 /git-reset
143 /git-restore
144 /git-rev-list
145 /git-rev-parse
146 /git-revert
147 /git-rm
148 /git-send-email
149 /git-send-pack
150 /git-sh-i18n
151 /git-sh-i18n--envsubst
152 /git-sh-setup
153 /git-shell
154 /git-shortlog
155 /git-show
156 /git-show-branch
157 /git-show-index
158 /git-show-ref
159 /git-sparse-checkout
160 /git-stage
161 /git-stash
162 /git-status
163 /git-stripspace
164 /git-submodule
165 /git-submodule--helper
166 /git-subtree
167 /git-svn
168 /git-switch
169 /git-symbolic-ref
170 /git-tag
171 /git-unpack-file
172 /git-unpack-objects
173 /git-update-index
174 /git-update-ref
175 /git-update-server-info
176 /git-upload-archive
177 /git-upload-pack
178 /git-var
179 /git-verify-commit
180 /git-verify-pack
181 /git-verify-tag
182 /git-version
183 /git-web--browse
184 /git-whatchanged
185 /git-worktree
186 /git-write-tree
187 /scalar
188 /git-core-*/?*
189 /git.res
190 /gitweb/GITWEB-BUILD-OPTIONS
191 /gitweb/gitweb.cgi
192 /gitweb/static/gitweb.js
193 /gitweb/static/gitweb.min.*
194 /config-list.h
195 /command-list.h
196 /hook-list.h
197 *.tar.gz
198 *.dsc
199 *.deb
200 /git.spec
201 *.exe
202 *.[aos]
203 *.o.json
204 *.py[co]
205 .build/
206 .depend/
207 *.gcda
208 *.gcno
209 *.gcov
210 /coverage-untested-functions
211 /cover_db/
212 /cover_db_html/
214 /config.mak
215 /autom4te.cache
216 /config.cache
217 /config.log
218 /config.status
219 /config.mak.autogen
220 /config.mak.append
221 /configure
222 /.vscode/
223 /tags
224 /TAGS
225 /cscope*
226 /compile_commands.json
227 /.cache/
228 *.hcc
229 *.obj
230 *.lib
231 *.sln
232 *.sp
233 *.suo
234 *.ncb
235 *.vcproj
236 *.user
237 *.idb
238 *.pdb
239 *.ilk
240 *.iobj
241 *.ipdb
242 *.dll
243 .vs/
244 Debug/
245 Release/
246 /UpgradeLog*.htm
247 /git.VC.VC.opendb
248 /git.VC.db
249 *.dSYM
250 /contrib/buildsystems/out