| Commit message (Expand) | Author | Age |
* | allow double click on current HEAD id after git-pull | Olaf Hering | 2006-03-09 |
* | Merge fixes early for next maint series. | Junio C Hamano | 2006-02-23 |
|\ |
|
| * | checkout - eye candy. | Junio C Hamano | 2006-02-22 |
| * | Keep Porcelainish from failing by broken ident after making changes. | Junio C Hamano | 2006-02-22 |
* | | Merge part of jc/portable branch | Junio C Hamano | 2006-02-21 |
|\ \ |
|
| * | | Optionally work without python | Johannes Schindelin | 2006-02-18 |
| |/ |
|
* | | Keep Porcelainish from failing by broken ident after making changes. | Junio C Hamano | 2006-02-18 |
|/ |
|
* | Only call git-rerere if $GIT_DIR/rr-cache exists. | Junio C Hamano | 2006-02-11 |
* | git-rerere: reuse recorded resolve. | Junio C Hamano | 2006-02-06 |
* | git-merge: Properly quote $merge_msg variable. | Junio C Hamano | 2006-02-03 |
* | merge: seed the commit message with list of conflicted files. | Junio C Hamano | 2006-01-27 |
* | merge --no-commit: tweak message | Junio C Hamano | 2005-12-23 |
* | Trivial usage string clean-up | freku045@student.liu.se | 2005-12-14 |
* | [PATCH] allow merging any committish | Junio C Hamano | 2005-12-13 |
* | git-merge: Exit with code 2 if no strategy was able to handle the merge. | Fredrik Kuivinen | 2005-12-03 |
* | git-sh-setup: die if outside git repository. | Junio C Hamano | 2005-11-25 |
* | git-merge: make recursive the default strategy | Junio C Hamano | 2005-11-23 |
* | Use 'merge-base --all' where applicable. | Junio C Hamano | 2005-11-09 |
* | 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 |