path: root/
AgeCommit message (Expand)Author
2008-07-08Build in mergeMiklos Vajna fix typo in usage message: sucesses --> succeedsBrandon Casey
2008-05-21git-merge: exclude unnecessary options from OPTIONS_SPECMiklos Vajna
2008-04-13merge, pull: add '--(no-)log' command line optionSZEDER Gábor
2008-04-13add 'merge.stat' config variableSZEDER Gábor
2008-04-13merge, pull: introduce '--(no-)stat' optionSZEDER Gábor
2008-03-05specify explicit "--pretty=medium" with `git log/show/whatchanged`Denis Cheng better handling of combined --squash,--no-ff,--no-commit optionsGerrit Pape
2007-11-18Merge branch 'ph/parseopt-sh'Junio C Hamano
2007-11-14Merge branch 'jc/stash-create'Junio C Hamano
2007-11-06Migrate to use git-rev-parse --parseoptPierre Habouzit
2007-11-01git-merge: no reason to use cpio anymoreJunio C Hamano
2007-10-03Merge branch 'lh/merge'Junio C Hamano
2007-10-03Merge branch 'jc/autogc'Junio C Hamano
2007-09-24Merge branch 'je/hooks'Junio C Hamano
2007-09-24git-merge: add --ff and --no-ff optionsLars Hjemli
2007-09-24git-merge: add support for --commit and --no-squashLars Hjemli
2007-09-24git-merge: add support for branch.<name>.mergeoptionsLars Hjemli
2007-09-24git-merge: refactor option parsingLars Hjemli
2007-09-24git-merge: fix faulty SQUASH_MSGLars Hjemli
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup
2007-09-19Add post-merge hook, related documentation, and tests.Josh England
2007-09-06Invoke "git gc --auto" from commit, merge, am and rebase.Junio C Hamano
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