path: root/
AgeCommit message (Expand)Author
2007-08-28git-merge: do up-to-date check also for all strategiesJunio C Hamano
2007-07-07Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-05-29Merge branch 'ar/mergestat'Junio C Hamano
2007-05-27Merge branch 'maint'Junio C Hamano
2007-05-26Merge branch 'maint-1.5.1' into maintJunio C Hamano
2007-05-26More echo "$user_message" fixes.Jeff King
2007-05-25Add a configuration option to control diffstat after mergeAlex Riesen
2007-05-10Add colour support in rebase and merge tree diff stats output.James Bowes
2007-04-07A new merge stragety 'subtree'.Junio C Hamano
2007-03-22git-merge: Put FETCH_HEAD data in merge commit messageMichael S. Tsirkin
2007-03-16git-merge: finish when git-read-tree failsSanti Béjar
2007-03-12git-merge: warn when -m provided on a fast forwardJ. Bruce Fields
2007-03-03git-merge: fail correctly when we cannot fast forward.Junio C Hamano
2007-02-16git-merge: minor fix for no_trivial_merge_strategies.Junio C Hamano
2007-01-29[PATCH] Rename git-repo-config to git-config.Tom Prince
2007-01-26git-merge: leave sensible reflog message when used as the first level UI.Junio C Hamano
2007-01-14Merge branch 'sp/merge' (early part)Junio C Hamano
2007-01-13Allow whole-tree operations to be started from a subdirectoryJunio C Hamano
2007-01-10Improve merge performance by avoiding in-index merges.Shawn O. Pearce
2007-01-10Disallow working directory commands in a bare repository.Shawn O. Pearce
2007-01-01fail pull/merge early in the middle of conflicted mergeJunio C Hamano
2006-12-28Honor pull.{twohead,octopus} in git-merge.Shawn O. Pearce
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce
2006-12-23Display 'theirs' branch name when possible in merge.Shawn O. Pearce
2006-12-22merge and reset: adjust for "reset --hard" messagesJunio C Hamano
2006-12-16merge: give a bit prettier merge message to "merge branch~$n"Junio C Hamano
2006-12-13Merge branch 'jc/read-tree-ignore'Junio C Hamano
2006-12-13git merge: reword failure message.Junio C Hamano
2006-12-06git-merge: fix "fix confusion between tag and branch" for realJunio C Hamano
2006-12-06git-merge: squelch needless error message.Junio C Hamano
2006-12-06Loosen "working file will be lost" check in Porcelain-ishJunio C Hamano
2006-12-03git-merge: fix confusion between tag and branchJunio C Hamano
2006-11-27git-merge: do not leak rev-parse output used for checking internally.Junio C Hamano
2006-11-27git-merge: tighten error checking.Junio C Hamano
2006-11-22merge: allow merging into a yet-to-be-born branch.Junio C Hamano
2006-11-22git-merge: make it usable as the first class UIJunio C Hamano
2006-11-22remove merge-recursive-oldJunio C Hamano
2006-10-23Merge branch 'maint'Junio C Hamano
2006-10-22git-merge: show usage if run without argumentsRene Scharfe
2006-10-01merge and resolve: Output short hashes and .. in "Updating ..."Santi Béjar
2006-09-25Deprecate merge-recursive.pyJunio C Hamano
2006-07-31Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano
2006-07-14recur vs recursive: help testing without touching too many stuff.Junio C Hamano
2006-07-14Status update on merge-recursive in CJohannes Schindelin
2006-07-11Log ref changes made by git-merge and git-pull.Shawn Pearce
2006-06-27Fix expr usage for FreeBSDDennis Stosberg
2006-06-24git-merge --squashJunio C Hamano
2006-06-24git-merge: Don't use -p when outputting summaryTimo Hirvonen
2006-05-14Convert some "apply --summary" users to "diff --summary".Sean