index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
git-merge-ours.sh
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
git-merge-ours: make sure our index matches HEAD
Junio C Hamano
2005-11-03
1
-0
/
+7
*
Add 'ours' merge strategy.
Junio C Hamano
2005-11-03
1
-0
/
+7