Add a new merge strategy by Fredrik Kuivinen.
[git/git.git] / .gitignore
CommitLineData
44ec46a9
JH
1git
2git-add
c68e10b1 3git-apply
44ec46a9
JH
4git-applymbox
5git-applypatch
6git-archimport
7git-bisect
8git-branch
c68e10b1
TV
9git-build-rev-cache
10git-cat-file
44ec46a9 11git-checkout
215a7ad1 12git-checkout-index
44ec46a9
JH
13git-cherry
14git-clone
c68e10b1 15git-clone-pack
44ec46a9 16git-commit
c68e10b1 17git-commit-tree
215a7ad1 18git-convert-objects
44ec46a9
JH
19git-count-objects
20git-cvsimport
c68e10b1 21git-daemon
44ec46a9 22git-diff
c68e10b1
TV
23git-diff-files
24git-diff-helper
44ec46a9 25git-diff-index
c68e10b1
TV
26git-diff-stages
27git-diff-tree
28git-export
44ec46a9 29git-fetch
c68e10b1 30git-fetch-pack
44ec46a9 31git-format-patch
215a7ad1 32git-fsck-objects
c68e10b1
TV
33git-get-tar-commit-id
34git-hash-object
215a7ad1 35git-http-fetch
c68e10b1 36git-init-db
215a7ad1 37git-local-fetch
44ec46a9 38git-log
c68e10b1 39git-ls-files
44ec46a9 40git-ls-remote
c68e10b1 41git-ls-tree
44ec46a9
JH
42git-mailinfo
43git-mailsplit
44git-merge
c68e10b1 45git-merge-base
720d150c 46git-merge-fredrik
215a7ad1 47git-merge-index
44ec46a9
JH
48git-merge-octopus
49git-merge-one-file
50git-merge-resolve
51git-merge-stupid
c68e10b1 52git-mktag
44ec46a9 53git-octopus
c68e10b1 54git-pack-objects
44ec46a9 55git-parse-remote
c68e10b1
TV
56git-patch-id
57git-peek-remote
44ec46a9 58git-prune
c68e10b1 59git-prune-packed
44ec46a9
JH
60git-pull
61git-push
c68e10b1 62git-read-tree
44ec46a9 63git-rebase
c68e10b1 64git-receive-pack
44ec46a9
JH
65git-relink
66git-rename
67git-repack
68git-request-pull
69git-reset
70git-resolve
c68e10b1
TV
71git-rev-list
72git-rev-parse
73git-rev-tree
44ec46a9 74git-revert
c68e10b1 75git-send-pack
44ec46a9
JH
76git-sh-setup
77git-shortlog
c68e10b1
TV
78git-show-branch
79git-show-index
80git-show-rev-cache
215a7ad1
JH
81git-ssh-fetch
82git-ssh-upload
44ec46a9 83git-status
c68e10b1 84git-stripspace
44ec46a9 85git-tag
c68e10b1
TV
86git-tar-tree
87git-unpack-file
88git-unpack-objects
215a7ad1 89git-update-index
c68e10b1
TV
90git-update-server-info
91git-upload-pack
92git-var
93git-verify-pack
44ec46a9
JH
94git-verify-tag
95git-whatchanged
c68e10b1 96git-write-tree