summaryrefslogtreecommitdiff
path: root/git-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2006-02-18Keep Porcelainish from failing by broken ident after making changes.Libravatar Junio C Hamano1-0/+5
2006-02-11Only call git-rerere if $GIT_DIR/rr-cache exists.Libravatar Junio C Hamano1-1/+4
2006-02-06git-rerere: reuse recorded resolve.Libravatar Junio C Hamano1-0/+1
2006-02-03git-merge: Properly quote $merge_msg variable.Libravatar Junio C Hamano1-1/+1
2006-01-27merge: seed the commit message with list of conflicted files.Libravatar Junio C Hamano1-0/+8
2005-12-23merge --no-commit: tweak messageLibravatar Junio C Hamano1-1/+10
2005-12-14Trivial usage string clean-upLibravatar freku045@student.liu.se1-4/+2
2005-12-13[PATCH] allow merging any committishLibravatar Junio C Hamano1-1/+4
2005-12-03git-merge: Exit with code 2 if no strategy was able to handle the merge.Libravatar Fredrik Kuivinen1-1/+2
2005-11-25git-sh-setup: die if outside git repository.Libravatar Junio C Hamano1-1/+1
2005-11-23git-merge: make recursive the default strategyLibravatar Junio C Hamano1-8/+12
2005-11-09Use 'merge-base --all' where applicable.Libravatar Junio C Hamano1-2/+9
2005-11-03Add 'ours' merge strategy.Libravatar Junio C Hamano1-1/+1
2005-11-03Add --no-commit to git-merge/git-pull.Libravatar Junio C Hamano1-10/+18
2005-10-28Documentation changes to recursive option for git-diff-treeLibravatar Chris Shoemaker1-1/+1
2005-10-22Allow git-merge not to commit.Libravatar Junio C Hamano1-11/+17
2005-10-03[PATCH] Enable and fix support for base less merges.Libravatar Fredrik Kuivinen1-2/+2
2005-10-02Handle really trivial case inside git-merge.Libravatar Junio C Hamano1-1/+21
2005-09-28Use git-update-ref in scripts.Libravatar Junio C Hamano1-4/+5
2005-09-28Fastpath the normal case by not checking that index matches HEAD.Libravatar Junio C Hamano1-7/+4
2005-09-26Give default merge message after failed automerge.Libravatar Junio C Hamano1-4/+10
2005-09-26Fix overzealous cleanliness check in git-mergeLibravatar Junio C Hamano1-18/+50
2005-09-25[PATCH] More descriptive messages for conflict cases in mergesLibravatar Fredrik Kuivinen1-3/+4
2005-09-13[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Libravatar Fredrik Kuivinen1-2/+2
2005-09-12Fix off-by-one error in git-mergeLibravatar Junio C Hamano1-1/+1
2005-09-10Add a new merge strategy by Fredrik Kuivinen.Libravatar Junio C Hamano1-1/+1
2005-09-10Use Daniel's read-tree in the merge strategy 'resolve'.Libravatar Junio C Hamano1-3/+3
2005-09-10Multi-backend merge driver.Libravatar Junio C Hamano1-0/+212
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 07:53:12 +0000