Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-merge.sh
Age
Commit message (
Expand
)
Author
2005-11-10
Use 'merge-base --all' where applicable.
Junio C Hamano
2005-11-04
Add 'ours' merge strategy.
Junio C Hamano
2005-11-04
Add --no-commit to git-merge/git-pull.
Junio C Hamano
2005-10-29
Documentation changes to recursive option for git-diff-tree
Chris Shoemaker
2005-10-22
Allow git-merge not to commit.
Junio C Hamano
2005-10-03
[PATCH] Enable and fix support for base less merges.
Fredrik Kuivinen
2005-10-02
Handle really trivial case inside git-merge.
Junio C Hamano
2005-09-29
Use git-update-ref in scripts.
Junio C Hamano
2005-09-29
Fastpath the normal case by not checking that index matches HEAD.
Junio C Hamano
2005-09-27
Give default merge message after failed automerge.
Junio C Hamano
2005-09-27
Fix overzealous cleanliness check in git-merge
Junio C Hamano
2005-09-26
[PATCH] More descriptive messages for conflict cases in merges
Fredrik Kuivinen
2005-09-13
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
Fredrik Kuivinen
2005-09-13
Fix off-by-one error in git-merge
Junio C Hamano
2005-09-11
Add a new merge strategy by Fredrik Kuivinen.
Junio C Hamano
2005-09-11
Use Daniel's read-tree in the merge strategy 'resolve'.
Junio C Hamano
2005-09-11
Multi-backend merge driver.
Junio C Hamano