Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
Use git-merge instead of git-resolve in git-pull.
[gitweb.git]
/
git-merge-resolve.sh
2005-09-11
Use Daniel's read-tree in the merge strategy 'resolve'.
blob
|
diff
|
raw
2005-09-11
Multi-backend merge driver.
blob
|
diff
|
raw
|
diff to current