index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-merge.sh
Commit message (
Expand
)
Author
Age
*
Add 'ours' merge strategy.
Junio C Hamano
2005-11-03
*
Add --no-commit to git-merge/git-pull.
Junio C Hamano
2005-11-03
*
Documentation changes to recursive option for git-diff-tree
Chris Shoemaker
2005-10-28
*
Allow git-merge not to commit.
Junio C Hamano
2005-10-22
*
[PATCH] Enable and fix support for base less merges.
Fredrik Kuivinen
2005-10-03
*
Handle really trivial case inside git-merge.
Junio C Hamano
2005-10-02
*
Use git-update-ref in scripts.
Junio C Hamano
2005-09-28
*
Fastpath the normal case by not checking that index matches HEAD.
Junio C Hamano
2005-09-28
*
Give default merge message after failed automerge.
Junio C Hamano
2005-09-26
*
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-25
*
[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-12
*
Add a new merge strategy by Fredrik Kuivinen.
Junio C Hamano
2005-09-10
*
Use Daniel's read-tree in the merge strategy 'resolve'.
Junio C Hamano
2005-09-10
*
Multi-backend merge driver.
Junio C Hamano
2005-09-10
