[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.

diff --git a/.gitignore b/.gitignore
index 245f54e050b65126ec28e82508a1b4e187ca8728..31c03f468bedafefe4c8d6dde1bc80e733cb4b62 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,51 +1,97 @@
+git
+git-add
 git-apply
+git-applymbox
+git-applypatch
+git-archimport
+git-bisect
+git-branch
 git-build-rev-cache
 git-cat-file
-git-checkout-cache
+git-checkout
+git-checkout-index
+git-cherry
+git-clone
 git-clone-pack
+git-commit
 git-commit-tree
-git-convert-cache
+git-convert-objects
+git-count-objects
+git-cvsimport
 git-daemon
-git-diff-cache
+git-diff
 git-diff-files
 git-diff-helper
+git-diff-index
 git-diff-stages
 git-diff-tree
 git-export
+git-fetch
 git-fetch-pack
-git-fsck-cache
+git-format-patch
+git-fsck-objects
 git-get-tar-commit-id
+git-grep
 git-hash-object
-git-http-pull
+git-http-fetch
 git-init-db
-git-local-pull
+git-local-fetch
+git-log
 git-ls-files
+git-ls-remote
 git-ls-tree
+git-mailinfo
+git-mailsplit
+git-merge
 git-merge-base
-git-merge-cache
+git-merge-index
+git-merge-octopus
+git-merge-one-file
+git-merge-recursive
+git-merge-resolve
+git-merge-stupid
 git-mktag
+git-octopus
 git-pack-objects
+git-parse-remote
 git-patch-id
 git-peek-remote
+git-prune
 git-prune-packed
+git-pull
+git-push
 git-read-tree
+git-rebase
 git-receive-pack
+git-relink
+git-rename
+git-repack
+git-request-pull
+git-reset
+git-resolve
 git-rev-list
 git-rev-parse
 git-rev-tree
+git-revert
 git-send-pack
+git-sh-setup
+git-shortlog
 git-show-branch
 git-show-index
 git-show-rev-cache
-git-ssh-pull
-git-ssh-push
+git-ssh-fetch
+git-ssh-upload
+git-status
 git-stripspace
+git-tag
 git-tar-tree
 git-unpack-file
 git-unpack-objects
-git-update-cache
+git-update-index
 git-update-server-info
 git-upload-pack
 git-var
 git-verify-pack
+git-verify-tag
+git-whatchanged
 git-write-tree