projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
merge-one-file: use empty- or common-base condintionally in two-stage merge.
[git.git]
/
git-merge-ours.sh
2005-11-03
Junio C Hamano
git-merge-ours: make sure our index matches HEAD
blob
|
commitdiff
2005-11-03
Junio C Hamano
Add 'ours' merge strategy.
blob
|
commitdiff
|
diff to current
projects / git.git / history