aboutsummaryrefslogtreecommitdiff
path: root/git-merge.sh
Commit message (Expand)AuthorAge
* Deprecate merge-recursive.pyJunio C Hamano2006-09-24
* Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano2006-07-30
|\
| * Log ref changes made by git-merge and git-pull.Shawn Pearce2006-07-11
* | recur vs recursive: help testing without touching too many stuff.Junio C Hamano2006-07-13
* | Status update on merge-recursive in CJohannes Schindelin2006-07-13
|/
* Fix expr usage for FreeBSDDennis Stosberg2006-06-27
* git-merge --squashJunio C Hamano2006-06-24
* git-merge: Don't use -p when outputting summaryTimo Hirvonen2006-06-23
* Convert some "apply --summary" users to "diff --summary".Sean2006-05-14
* git-merge: a bit more readable user guidance.Junio C Hamano2006-04-19
* git-merge knows some strategies want to skip trivial mergesJunio C Hamano2006-03-20
* allow double click on current HEAD id after git-pullOlaf Hering2006-03-09
* Merge fixes early for next maint series.Junio C Hamano2006-02-23
|\
| * checkout - eye candy.Junio C Hamano2006-02-22
| * Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano2006-02-22
* | Merge part of jc/portable branchJunio C Hamano2006-02-21
|\ \
| * | Optionally work without pythonJohannes Schindelin2006-02-18
| |/
* | Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano2006-02-18
|/
* Only call git-rerere if $GIT_DIR/rr-cache exists.Junio C Hamano2006-02-11
* git-rerere: reuse recorded resolve.Junio C Hamano2006-02-06
* git-merge: Properly quote $merge_msg variable.Junio C Hamano2006-02-03
* merge: seed the commit message with list of conflicted files.Junio C Hamano2006-01-27
* merge --no-commit: tweak messageJunio C Hamano2005-12-23
* Trivial usage string clean-upfreku045@student.liu.se2005-12-14
* [PATCH] allow merging any committishJunio C Hamano2005-12-13
* git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen2005-12-03
* git-sh-setup: die if outside git repository.Junio C Hamano2005-11-25
* git-merge: make recursive the default strategyJunio C Hamano2005-11-23
* Use 'merge-base --all' where applicable.Junio C Hamano2005-11-09
* Add 'ours' merge strategy.Junio C Hamano2005-11-03
* Add --no-commit to git-merge/git-pull.Junio C Hamano2005-11-03
* Documentation changes to recursive option for git-diff-treeChris Shoemaker2005-10-28
* Allow git-merge not to commit.Junio C Hamano2005-10-22
* [PATCH] Enable and fix support for base less merges.Fredrik Kuivinen2005-10-03
* Handle really trivial case inside git-merge.Junio C Hamano2005-10-02
* Use git-update-ref in scripts.Junio C Hamano2005-09-28
* Fastpath the normal case by not checking that index matches HEAD.Junio C Hamano2005-09-28
* Give default merge message after failed automerge.Junio C Hamano2005-09-26
* Fix overzealous cleanliness check in git-mergeJunio C Hamano2005-09-26
* [PATCH] More descriptive messages for conflict cases in mergesFredrik Kuivinen2005-09-25
* [PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen2005-09-13
* Fix off-by-one error in git-mergeJunio C Hamano2005-09-12
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-10
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-10
* Multi-backend merge driver.Junio C Hamano2005-09-10
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-15 20:13:57 +0000