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