projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
[git.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
cc2b29e
..
31c03f4
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-44,10
+44,10
@@
git-mailinfo
git-mailsplit
git-merge
git-merge-base
-git-merge-fredrik
git-merge-index
git-merge-octopus
git-merge-one-file
+git-merge-recursive
git-merge-resolve
git-merge-stupid
git-mktag