index
:
git
main
maint
master
next
seen
todo
Mirror of https://git.kernel.org/pub/scm/git/git.git/
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
git-merge-ours.sh
(
follow
)
Age
Commit message (
Expand
)
Author
Files
Lines
2005-11-03
git-merge-ours: make sure our index matches HEAD
Junio C Hamano
1
-0
/
+7
2005-11-03
Add 'ours' merge strategy.
Junio C Hamano
1
-0
/
+7