| Commit message (Expand) | Author | Age | Files | Lines |
* | git-merge: show usage if run without arguments | Rene Scharfe | 2006-10-22 | 1 | -0/+2 |
* | Deprecate merge-recursive.py | Junio C Hamano | 2006-09-24 | 1 | -13/+3 |
* | Merge branch 'js/read-tree' into js/c-merge-recursive | Junio C Hamano | 2006-07-30 | 1 | -3/+14 |
|\ |
|
| * | Log ref changes made by git-merge and git-pull. | Shawn Pearce | 2006-07-11 | 1 | -3/+14 |
* | | recur vs recursive: help testing without touching too many stuff. | Junio C Hamano | 2006-07-13 | 1 | -2/+11 |
* | | Status update on merge-recursive in C | Johannes Schindelin | 2006-07-13 | 1 | -3/+3 |
|/ |
|
* | Fix expr usage for FreeBSD | Dennis Stosberg | 2006-06-27 | 1 | -1/+1 |
* | git-merge --squash | Junio C Hamano | 2006-06-24 | 1 | -19/+53 |
* | git-merge: Don't use -p when outputting summary | Timo Hirvonen | 2006-06-23 | 1 | -1/+1 |
* | Convert some "apply --summary" users to "diff --summary". | Sean | 2006-05-14 | 1 | -2/+1 |
* | git-merge: a bit more readable user guidance. | Junio C Hamano | 2006-04-19 | 1 | -1/+1 |
* | git-merge knows some strategies want to skip trivial merges | Junio C Hamano | 2006-03-20 | 1 | -27/+40 |
* | allow double click on current HEAD id after git-pull | Olaf Hering | 2006-03-09 | 1 | -1/+1 |
* | Merge fixes early for next maint series. | Junio C Hamano | 2006-02-23 | 1 | -2/+2 |
|\ |
|
| * | checkout - eye candy. | Junio C Hamano | 2006-02-22 | 1 | -2/+2 |
| * | Keep Porcelainish from failing by broken ident after making changes. | Junio C Hamano | 2006-02-22 | 1 | -0/+5 |
* | | Merge part of jc/portable branch | Junio C Hamano | 2006-02-21 | 1 | -0/+4 |
|\ \ |
|
| * | | Optionally work without python | Johannes Schindelin | 2006-02-18 | 1 | -0/+4 |
| |/ |
|
* | | Keep Porcelainish from failing by broken ident after making changes. | Junio C Hamano | 2006-02-18 | 1 | -0/+5 |
|/ |
|
* | Only call git-rerere if $GIT_DIR/rr-cache exists. | Junio C Hamano | 2006-02-11 | 1 | -1/+4 |
* | git-rerere: reuse recorded resolve. | Junio C Hamano | 2006-02-06 | 1 | -0/+1 |
* | git-merge: Properly quote $merge_msg variable. | Junio C Hamano | 2006-02-03 | 1 | -1/+1 |
* | merge: seed the commit message with list of conflicted files. | Junio C Hamano | 2006-01-27 | 1 | -0/+8 |
* | merge --no-commit: tweak message | Junio C Hamano | 2005-12-23 | 1 | -1/+10 |
* | Trivial usage string clean-up | freku045@student.liu.se | 2005-12-14 | 1 | -4/+2 |
* | [PATCH] allow merging any committish | Junio C Hamano | 2005-12-13 | 1 | -1/+4 |
* | git-merge: Exit with code 2 if no strategy was able to handle the merge. | Fredrik Kuivinen | 2005-12-03 | 1 | -1/+2 |
* | git-sh-setup: die if outside git repository. | Junio C Hamano | 2005-11-25 | 1 | -1/+1 |
* | git-merge: make recursive the default strategy | Junio C Hamano | 2005-11-23 | 1 | -8/+12 |
* | Use 'merge-base --all' where applicable. | Junio C Hamano | 2005-11-09 | 1 | -2/+9 |
* | Add 'ours' merge strategy. | Junio C Hamano | 2005-11-03 | 1 | -1/+1 |
* | Add --no-commit to git-merge/git-pull. | Junio C Hamano | 2005-11-03 | 1 | -10/+18 |
* | Documentation changes to recursive option for git-diff-tree | Chris Shoemaker | 2005-10-28 | 1 | -1/+1 |
* | Allow git-merge not to commit. | Junio C Hamano | 2005-10-22 | 1 | -11/+17 |
* | [PATCH] Enable and fix support for base less merges. | Fredrik Kuivinen | 2005-10-03 | 1 | -2/+2 |
* | Handle really trivial case inside git-merge. | Junio C Hamano | 2005-10-02 | 1 | -1/+21 |
* | Use git-update-ref in scripts. | Junio C Hamano | 2005-09-28 | 1 | -4/+5 |
* | Fastpath the normal case by not checking that index matches HEAD. | Junio C Hamano | 2005-09-28 | 1 | -7/+4 |
* | Give default merge message after failed automerge. | Junio C Hamano | 2005-09-26 | 1 | -4/+10 |
* | Fix overzealous cleanliness check in git-merge | Junio C Hamano | 2005-09-26 | 1 | -18/+50 |
* | [PATCH] More descriptive messages for conflict cases in merges | Fredrik Kuivinen | 2005-09-25 | 1 | -3/+4 |
* | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. | Fredrik Kuivinen | 2005-09-13 | 1 | -2/+2 |
* | Fix off-by-one error in git-merge | Junio C Hamano | 2005-09-12 | 1 | -1/+1 |
* | Add a new merge strategy by Fredrik Kuivinen. | Junio C Hamano | 2005-09-10 | 1 | -1/+1 |
* | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano | 2005-09-10 | 1 | -3/+3 |
* | Multi-backend merge driver. | Junio C Hamano | 2005-09-10 | 1 | -0/+212 |