Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'svnup' of http://netz.smurf.noris.de/git/git
[gitweb.git]
/
git-merge-ours.sh
2005-11-03
git-merge-ours: make sure our index matches HEAD
blob
|
diff
|
raw
2005-11-03
Add 'ours' merge strategy.
blob
|
diff
|
raw
|
diff to current