A new merge stragety 'subtree'.
[git/git.git] / .gitignore
CommitLineData
f60349aa 1GIT-CFLAGS
30551781 2GIT-GUI-VARS
9b88fcef 3GIT-VERSION-FILE
44ec46a9
JH
4git
5git-add
5cde71d6 6git-add--interactive
01eea6f3 7git-am
6ee9240f 8git-annotate
c68e10b1 9git-apply
44ec46a9
JH
10git-applymbox
11git-applypatch
12git-archimport
4df096a5 13git-archive
44ec46a9 14git-bisect
7948d774 15git-blame
44ec46a9 16git-branch
2e0afafe 17git-bundle
c68e10b1 18git-cat-file
622ef9df 19git-check-ref-format
44ec46a9 20git-checkout
215a7ad1 21git-checkout-index
44ec46a9 22git-cherry
4eba0f37 23git-cherry-pick
c3b831bd 24git-clean
44ec46a9 25git-clone
44ec46a9 26git-commit
c68e10b1 27git-commit-tree
e0d10e1c 28git-config
215a7ad1 29git-convert-objects
44ec46a9 30git-count-objects
390cb0c1 31git-cvsexportcommit
44ec46a9 32git-cvsimport
6ee9240f 33git-cvsserver
c68e10b1 34git-daemon
44ec46a9 35git-diff
c68e10b1 36git-diff-files
44ec46a9 37git-diff-index
c68e10b1 38git-diff-tree
5a25b4a6 39git-describe
db5e523f 40git-fast-import
44ec46a9 41git-fetch
f98ef68f 42git-fetch--tool
c68e10b1 43git-fetch-pack
01eea6f3 44git-findtags
49c188fa 45git-fmt-merge-msg
9f613ddd 46git-for-each-ref
44ec46a9 47git-format-patch
df391b19 48git-fsck
215a7ad1 49git-fsck-objects
30f610b7 50git-gc
c68e10b1 51git-get-tar-commit-id
2aba319a 52git-grep
c68e10b1 53git-hash-object
215a7ad1 54git-http-fetch
390cb0c1 55git-http-push
f2561fda 56git-imap-send
01eea6f3 57git-index-pack
baee1e91 58git-init
c68e10b1 59git-init-db
a51d37c1 60git-instaweb
215a7ad1 61git-local-fetch
44ec46a9 62git-log
0086e2c8 63git-lost-found
c68e10b1 64git-ls-files
44ec46a9 65git-ls-remote
c68e10b1 66git-ls-tree
44ec46a9
JH
67git-mailinfo
68git-mailsplit
69git-merge
c68e10b1 70git-merge-base
215a7ad1 71git-merge-index
e2b70087 72git-merge-file
6ee9240f 73git-merge-tree
44ec46a9
JH
74git-merge-octopus
75git-merge-one-file
64da9e60 76git-merge-ours
e4cf17ce 77git-merge-recursive
44ec46a9
JH
78git-merge-resolve
79git-merge-stupid
68faf689 80git-merge-subtree
c4b4a5af 81git-mergetool
c68e10b1 82git-mktag
6ee9240f 83git-mktree
6d0de319
JS
84git-name-rev
85git-mv
9bc0f32c 86git-pack-redundant
c68e10b1 87git-pack-objects
b3dc864c 88git-pack-refs
44ec46a9 89git-parse-remote
c68e10b1
TV
90git-patch-id
91git-peek-remote
44ec46a9 92git-prune
c68e10b1 93git-prune-packed
44ec46a9
JH
94git-pull
95git-push
405053d2 96git-quiltimport
c68e10b1 97git-read-tree
44ec46a9 98git-rebase
c68e10b1 99git-receive-pack
7dc26923 100git-reflog
44ec46a9 101git-relink
baee1e91 102git-remote
44ec46a9 103git-repack
ee72aeaf 104git-repo-config
44ec46a9 105git-request-pull
d19e06fa 106git-rerere
44ec46a9 107git-reset
c68e10b1
TV
108git-rev-list
109git-rev-parse
44ec46a9 110git-revert
d4a1cab5 111git-rm
c91f0d92 112git-runstatus
a09af243 113git-send-email
c68e10b1 114git-send-pack
44ec46a9 115git-sh-setup
6d0de319 116git-shell
44ec46a9 117git-shortlog
80d48ac6 118git-show
c68e10b1
TV
119git-show-branch
120git-show-index
582c5b09 121git-show-ref
215a7ad1 122git-ssh-fetch
f71a69ab
JH
123git-ssh-pull
124git-ssh-push
215a7ad1 125git-ssh-upload
44ec46a9 126git-status
c68e10b1 127git-stripspace
60d02ccc 128git-svn
542a01e4 129git-svnimport
8098a178 130git-symbolic-ref
44ec46a9 131git-tag
c68e10b1
TV
132git-tar-tree
133git-unpack-file
134git-unpack-objects
215a7ad1 135git-update-index
49c188fa 136git-update-ref
c68e10b1 137git-update-server-info
39345a21 138git-upload-archive
c68e10b1
TV
139git-upload-pack
140git-var
141git-verify-pack
44ec46a9
JH
142git-verify-tag
143git-whatchanged
c68e10b1 144git-write-tree
e558e33b 145git-core-*/?*
30551781 146gitk-wish
403ccc4f 147gitweb/gitweb.cgi
17e48368 148test-chmtime
390cb0c1
JH
149test-date
150test-delta
17448209 151test-dump-cache-tree
68faf689 152test-match-trees
a87cd02c 153common-cmds.h
e558e33b
JH
154*.tar.gz
155*.dsc
156*.deb
157git-core.spec
11b1a5db 158*.exe
3467fec5 159*.[ao]
10ae7d86 160*.py[co]
d19e06fa 161config.mak
55667714 162autom4te.cache
2878836c 163config.cache
55667714
JN
164config.log
165config.status
55667714 166config.mak.autogen
1b1b678e 167config.mak.append
55667714 168configure