index
:
git
main
maint
master
next
seen
todo
Git: sistema de control de versiones
mirror
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t6037-merge-ours-theirs.sh
Age
Commit message (
Expand
)
Author
2010-01-18
Teach git-pull to pass -X<option> to git-merge
Avery Pennarun
2010-01-18
git merge -X<option>
Avery Pennarun