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