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