projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Support remote references with slashes in their names
[git.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
927c89c
..
3edf6b4
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-50,6
+50,7
@@
git-merge-base
git-merge-index
git-merge-octopus
git-merge-one-file
+git-merge-ours
git-merge-recursive
git-merge-resolve
git-merge-stupid