| Commit message (Expand) | Author | Age |
* | git-merge: finish when git-read-tree fails | Santi Béjar | 2007-03-16 |
* | git-merge: warn when -m provided on a fast forward | J. Bruce Fields | 2007-03-11 |
* | git-merge: fail correctly when we cannot fast forward. | Junio C Hamano | 2007-03-03 |
* | git-merge: minor fix for no_trivial_merge_strategies. | Junio C Hamano | 2007-02-16 |
* | [PATCH] Rename git-repo-config to git-config. | Tom Prince | 2007-01-28 |
* | git-merge: leave sensible reflog message when used as the first level UI. | Junio C Hamano | 2007-01-26 |
* | Merge branch 'sp/merge' (early part) | Junio C Hamano | 2007-01-14 |
|\ |
|
| * | Improve merge performance by avoiding in-index merges. | Shawn O. Pearce | 2007-01-10 |
* | | Allow whole-tree operations to be started from a subdirectory | Junio C Hamano | 2007-01-12 |
* | | Disallow working directory commands in a bare repository. | Shawn O. Pearce | 2007-01-10 |
|/ |
|
* | fail pull/merge early in the middle of conflicted merge | Junio C Hamano | 2007-01-01 |
* | Honor pull.{twohead,octopus} in git-merge. | Shawn O. Pearce | 2006-12-28 |
* | Use GIT_REFLOG_ACTION environment variable instead. | Shawn O. Pearce | 2006-12-28 |
* | Display 'theirs' branch name when possible in merge. | Shawn O. Pearce | 2006-12-23 |
* | merge and reset: adjust for "reset --hard" messages | Junio C Hamano | 2006-12-22 |
* | merge: give a bit prettier merge message to "merge branch~$n" | Junio C Hamano | 2006-12-16 |
* | Merge branch 'jc/read-tree-ignore' | Junio C Hamano | 2006-12-13 |
|\ |
|
| * | Loosen "working file will be lost" check in Porcelain-ish | Junio C Hamano | 2006-12-05 |
* | | git merge: reword failure message. | Junio C Hamano | 2006-12-13 |
* | | git-merge: fix "fix confusion between tag and branch" for real | Junio C Hamano | 2006-12-06 |
* | | git-merge: squelch needless error message. | Junio C Hamano | 2006-12-06 |
|/ |
|
* | git-merge: fix confusion between tag and branch | Junio C Hamano | 2006-12-02 |
* | git-merge: do not leak rev-parse output used for checking internally. | Junio C Hamano | 2006-11-26 |
* | git-merge: tighten error checking. | Junio C Hamano | 2006-11-26 |
* | merge: allow merging into a yet-to-be-born branch. | Junio C Hamano | 2006-11-21 |
* | git-merge: make it usable as the first class UI | Junio C Hamano | 2006-11-21 |
* | remove merge-recursive-old | Junio C Hamano | 2006-11-21 |
* | Merge branch 'maint' | Junio C Hamano | 2006-10-22 |
|\ |
|
| * | git-merge: show usage if run without arguments | Rene Scharfe | 2006-10-22 |
* | | merge and resolve: Output short hashes and .. in "Updating ..." | Santi Béjar | 2006-09-30 |
|/ |
|
* | Deprecate merge-recursive.py | Junio C Hamano | 2006-09-24 |
* | Merge branch 'js/read-tree' into js/c-merge-recursive | Junio C Hamano | 2006-07-30 |
|\ |
|
| * | Log ref changes made by git-merge and git-pull. | Shawn Pearce | 2006-07-11 |
* | | recur vs recursive: help testing without touching too many stuff. | Junio C Hamano | 2006-07-13 |
* | | Status update on merge-recursive in C | Johannes Schindelin | 2006-07-13 |
|/ |
|
* | Fix expr usage for FreeBSD | Dennis Stosberg | 2006-06-27 |
* | git-merge --squash | Junio C Hamano | 2006-06-24 |
* | git-merge: Don't use -p when outputting summary | Timo Hirvonen | 2006-06-23 |
* | Convert some "apply --summary" users to "diff --summary". | Sean | 2006-05-14 |
* | git-merge: a bit more readable user guidance. | Junio C Hamano | 2006-04-19 |
* | git-merge knows some strategies want to skip trivial merges | Junio C Hamano | 2006-03-20 |
* | 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 |