index
:
user/sven/git.git
gitweb/more-expires
gitweb/show-remotes
local
master
origin/HEAD
origin/maint
origin/master
Git
Sven Wegener
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-merge.sh
Age
Commit message (
Expand
)
Author
2005-12-23
merge --no-commit: tweak message
Junio C Hamano
2005-12-14
Trivial usage string clean-up
freku045@student.liu.se
2005-12-13
[PATCH] allow merging any committish
Junio C Hamano
2005-12-03
git-merge: Exit with code 2 if no strategy was able to handle the merge.
Fredrik Kuivinen
2005-11-25
git-sh-setup: die if outside git repository.
Junio C Hamano
2005-11-23
git-merge: make recursive the default strategy
Junio C Hamano
2005-11-09
Use 'merge-base --all' where applicable.
Junio C Hamano
2005-11-03
Add 'ours' merge strategy.
Junio C Hamano
2005-11-03
Add --no-commit to git-merge/git-pull.
Junio C Hamano
2005-10-28
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-28
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-26
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-25
[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-12
Fix off-by-one error in git-merge
Junio C Hamano
2005-09-10
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
