index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t6037-merge-ours-theirs.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2010-01-17
Teach git-pull to pass -X<option> to git-merge
Avery Pennarun
1
-0
/
+8
2010-01-17
git merge -X<option>
Avery Pennarun
1
-0
/
+56