rebase: implement --merge via the interactive machinery
[git/debian.git] / .gitignore
blob910b1d2d2f003b8ee076fb0989c4e14c6c5bb1f3
1 /fuzz_corpora
2 /fuzz-pack-headers
3 /fuzz-pack-idx
4 /GIT-BUILD-OPTIONS
5 /GIT-CFLAGS
6 /GIT-LDFLAGS
7 /GIT-PREFIX
8 /GIT-PERL-DEFINES
9 /GIT-PERL-HEADER
10 /GIT-PYTHON-VARS
11 /GIT-SCRIPT-DEFINES
12 /GIT-USER-AGENT
13 /GIT-VERSION-FILE
14 /bin-wrappers/
15 /git
16 /git-add
17 /git-add--interactive
18 /git-am
19 /git-annotate
20 /git-apply
21 /git-archimport
22 /git-archive
23 /git-bisect
24 /git-bisect--helper
25 /git-blame
26 /git-branch
27 /git-bundle
28 /git-cat-file
29 /git-check-attr
30 /git-check-ignore
31 /git-check-mailmap
32 /git-check-ref-format
33 /git-checkout
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-diff
54 /git-diff-files
55 /git-diff-index
56 /git-diff-tree
57 /git-difftool
58 /git-difftool--helper
59 /git-describe
60 /git-fast-export
61 /git-fast-import
62 /git-fetch
63 /git-fetch-pack
64 /git-filter-branch
65 /git-fmt-merge-msg
66 /git-for-each-ref
67 /git-format-patch
68 /git-fsck
69 /git-fsck-objects
70 /git-gc
71 /git-get-tar-commit-id
72 /git-grep
73 /git-hash-object
74 /git-help
75 /git-http-backend
76 /git-http-fetch
77 /git-http-push
78 /git-imap-send
79 /git-index-pack
80 /git-init
81 /git-init-db
82 /git-interpret-trailers
83 /git-instaweb
84 /git-legacy-rebase
85 /git-log
86 /git-ls-files
87 /git-ls-remote
88 /git-ls-tree
89 /git-mailinfo
90 /git-mailsplit
91 /git-merge
92 /git-merge-base
93 /git-merge-index
94 /git-merge-file
95 /git-merge-tree
96 /git-merge-octopus
97 /git-merge-one-file
98 /git-merge-ours
99 /git-merge-recursive
100 /git-merge-resolve
101 /git-merge-subtree
102 /git-mergetool
103 /git-mergetool--lib
104 /git-mktag
105 /git-mktree
106 /git-multi-pack-index
107 /git-mv
108 /git-name-rev
109 /git-notes
110 /git-p4
111 /git-pack-redundant
112 /git-pack-objects
113 /git-pack-refs
114 /git-parse-remote
115 /git-patch-id
116 /git-prune
117 /git-prune-packed
118 /git-pull
119 /git-push
120 /git-quiltimport
121 /git-range-diff
122 /git-read-tree
123 /git-rebase
124 /git-rebase--am
125 /git-rebase--common
126 /git-rebase--interactive
127 /git-rebase--preserve-merges
128 /git-receive-pack
129 /git-reflog
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-remote-testgit
138 /git-remote-testpy
139 /git-remote-testsvn
140 /git-repack
141 /git-replace
142 /git-request-pull
143 /git-rerere
144 /git-reset
145 /git-rev-list
146 /git-rev-parse
147 /git-revert
148 /git-rm
149 /git-send-email
150 /git-send-pack
151 /git-serve
152 /git-sh-i18n
153 /git-sh-i18n--envsubst
154 /git-sh-setup
155 /git-sh-i18n
156 /git-shell
157 /git-shortlog
158 /git-show
159 /git-show-branch
160 /git-show-index
161 /git-show-ref
162 /git-stage
163 /git-stash
164 /git-status
165 /git-stripspace
166 /git-submodule
167 /git-submodule--helper
168 /git-svn
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-web--browse
183 /git-whatchanged
184 /git-worktree
185 /git-write-tree
186 /git-core-*/?*
187 /gitweb/GITWEB-BUILD-OPTIONS
188 /gitweb/gitweb.cgi
189 /gitweb/static/gitweb.js
190 /gitweb/static/gitweb.min.*
191 /command-list.h
192 *.tar.gz
193 *.dsc
194 *.deb
195 /git.spec
196 *.exe
197 *.[aos]
198 *.py[co]
199 .depend/
200 *.gcda
201 *.gcno
202 *.gcov
203 /coverage-untested-functions
204 /cover_db/
205 /cover_db_html/
207 /config.mak
208 /autom4te.cache
209 /config.cache
210 /config.log
211 /config.status
212 /config.mak.autogen
213 /config.mak.append
214 /configure
215 /.vscode/
216 /tags
217 /TAGS
218 /cscope*
219 *.obj
220 *.lib
221 *.res
222 *.sln
223 *.suo
224 *.ncb
225 *.vcproj
226 *.user
227 *.idb
228 *.pdb
229 /Debug/
230 /Release/