aboutsummaryrefslogtreecommitdiffstats
path: root/git-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2008-07-07Build in mergeMiklos Vajna1-554/+0
2008-06-19git-merge.sh: fix typo in usage message: sucesses --> succeedsBrandon Casey1-1/+1
2008-05-21git-merge: exclude unnecessary options from OPTIONS_SPECMiklos Vajna1-3/+1
2008-04-12merge, pull: add '--(no-)log' command line optionSZEDER Gábor1-2/+6
2008-04-12add 'merge.stat' config variableSZEDER Gábor1-0/+1
2008-04-12merge, pull: introduce '--(no-)stat' optionSZEDER Gábor1-4/+6
2008-03-05specify explicit "--pretty=medium" with `git log/show/whatchanged`Denis Cheng1-1/+1
2008-03-03git-merge.sh: better handling of combined --squash,--no-ff,--no-commit optionsGerrit Pape1-6/+11
2007-11-17Merge branch 'ph/parseopt-sh'Junio C Hamano1-72/+54
2007-11-14Merge branch 'jc/stash-create'Junio C Hamano1-6/+5
2007-11-05Migrate git-merge.sh to use git-rev-parse --parseoptPierre Habouzit1-72/+54
2007-11-01git-merge: no reason to use cpio anymoreJunio C Hamano1-6/+5
2007-10-03Merge branch 'lh/merge'Junio C Hamano1-11/+54
2007-10-03Merge branch 'jc/autogc'Junio C Hamano1-0/+1
2007-09-23Merge branch 'je/hooks'Junio C Hamano1-0/+13
2007-09-23git-merge: add --ff and --no-ff optionsLars Hjemli1-6/+16
2007-09-23git-merge: add support for --commit and --no-squashLars Hjemli1-2/+6
2007-09-23git-merge: add support for branch.<name>.mergeoptionsLars Hjemli1-0/+21
2007-09-23git-merge: refactor option parsingLars Hjemli1-6/+14
2007-09-23git-merge: fix faulty SQUASH_MSGLars Hjemli1-1/+1
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup1-1/+1
2007-09-18Add post-merge hook, related documentation, and tests.Josh England1-0/+13
2007-09-06Invoke "git gc --auto" from commit, merge, am and rebase.Junio C Hamano1-0/+1
2007-08-27git-merge: do up-to-date check also for all strategiesJunio C Hamano1-15/+20
2007-07-06Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin1-4/+1
2007-07-02Rewrite "git-frotz" to "git frotz"Junio C Hamano1-36/+36
2007-05-29Merge branch 'ar/mergestat'Junio C Hamano1-6/+12
2007-05-26Merge branch 'maint'Junio C Hamano1-3/+3
2007-05-26Merge branch 'maint-1.5.1' into maintJunio C Hamano1-3/+3
2007-05-26More echo "$user_message" fixes.Jeff King1-3/+3
2007-05-24Add a configuration option to control diffstat after mergeAlex Riesen1-6/+12
2007-05-10Add colour support in rebase and merge tree diff stats output.James Bowes1-1/+2
2007-04-07A new merge stragety 'subtree'.Junio C Hamano1-2/+2
2007-03-22git-merge: Put FETCH_HEAD data in merge commit messageMichael S. Tsirkin1-0/+4
2007-03-16git-merge: finish when git-read-tree failsSanti Béjar1-2/+2
2007-03-11git-merge: warn when -m provided on a fast forwardJ. Bruce Fields1-1/+6
2007-03-03git-merge: fail correctly when we cannot fast forward.Junio C Hamano1-1/+1
2007-02-16git-merge: minor fix for no_trivial_merge_strategies.Junio C Hamano1-6/+9
2007-01-28[PATCH] Rename git-repo-config to git-config.Tom Prince1-2/+2
2007-01-26git-merge: leave sensible reflog message when used as the first level UI.Junio C Hamano1-1/+1
2007-01-14Merge branch 'sp/merge' (early part)Junio C Hamano1-17/+23
2007-01-12Allow whole-tree operations to be started from a subdirectoryJunio C Hamano1-1/+3
2007-01-10Improve merge performance by avoiding in-index merges.Shawn O. Pearce1-17/+23
2007-01-10Disallow working directory commands in a bare repository.Shawn O. Pearce1-0/+1
2007-01-01fail pull/merge early in the middle of conflicted mergeJunio C Hamano1-0/+3
2006-12-28Honor pull.{twohead,octopus} in git-merge.Shawn O. Pearce1-2/+14
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce1-8/+5
2006-12-23Display 'theirs' branch name when possible in merge.Shawn O. Pearce1-0/+2
2006-12-22merge and reset: adjust for "reset --hard" messagesJunio C Hamano1-1/+1
2006-12-16merge: give a bit prettier merge message to "merge branch~$n"Junio C Hamano1-9/+17
2006-12-13Merge branch 'jc/read-tree-ignore'Junio C Hamano1-1/+1
2006-12-13git merge: reword failure message.Junio C Hamano1-1/+8
2006-12-06git-merge: fix "fix confusion between tag and branch" for realJunio C Hamano1-2/+3
2006-12-06git-merge: squelch needless error message.Junio C Hamano1-1/+1
2006-12-05Loosen "working file will be lost" check in Porcelain-ishJunio C Hamano1-1/+1
2006-12-02git-merge: fix confusion between tag and branchJunio C Hamano1-5/+5
2006-11-26git-merge: do not leak rev-parse output used for checking internally.Junio C Hamano1-1/+1
2006-11-26git-merge: tighten error checking.Junio C Hamano1-3/+3
2006-11-21merge: allow merging into a yet-to-be-born branch.Junio C Hamano1-0/+18
2006-11-21git-merge: make it usable as the first class UIJunio C Hamano1-7/+54
2006-11-21remove merge-recursive-oldJunio C Hamano1-4/+1
2006-10-22Merge branch 'maint'Junio C Hamano1-0/+2
2006-10-22git-merge: show usage if run without argumentsRene Scharfe1-0/+2
2006-09-30merge and resolve: Output short hashes and .. in "Updating ..."Santi Béjar1-1/+1
2006-09-24Deprecate merge-recursive.pyJunio C Hamano1-13/+3
2006-07-30Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano1-3/+14
2006-07-13recur vs recursive: help testing without touching too many stuff.Junio C Hamano1-2/+11
2006-07-13Status update on merge-recursive in CJohannes Schindelin1-3/+3
2006-07-11Log ref changes made by git-merge and git-pull.Shawn Pearce1-3/+14
2006-06-27Fix expr usage for FreeBSDDennis Stosberg1-1/+1
2006-06-24git-merge --squashJunio C Hamano1-19/+53
2006-06-23git-merge: Don't use -p when outputting summaryTimo Hirvonen1-1/+1
2006-05-14Convert some "apply --summary" users to "diff --summary".Sean1-2/+1
2006-04-19git-merge: a bit more readable user guidance.Junio C Hamano1-1/+1
2006-03-20git-merge knows some strategies want to skip trivial mergesJunio C Hamano1-27/+40
2006-03-09allow double click on current HEAD id after git-pullOlaf Hering1-1/+1
2006-02-23Merge fixes early for next maint series.Junio C Hamano1-2/+2
2006-02-22checkout - eye candy.Junio C Hamano1-2/+2
2006-02-22Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano1-0/+5
2006-02-21Merge part of jc/portable branchJunio C Hamano1-0/+4
2006-02-18Optionally work without pythonJohannes Schindelin1-0/+4
2006-02-18Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano1-0/+5
2006-02-11Only call git-rerere if $GIT_DIR/rr-cache exists.Junio C Hamano1-1/+4
2006-02-06git-rerere: reuse recorded resolve.Junio C Hamano1-0/+1
2006-02-03git-merge: Properly quote $merge_msg variable.Junio C Hamano1-1/+1
2006-01-27merge: seed the commit message with list of conflicted files.Junio C Hamano1-0/+8
2005-12-23merge --no-commit: tweak messageJunio C Hamano1-1/+10
2005-12-14Trivial usage string clean-upfreku045@student.liu.se1-4/+2
2005-12-13[PATCH] allow merging any committishJunio C Hamano1-1/+4
2005-12-03git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen1-1/+2
2005-11-25git-sh-setup: die if outside git repository.Junio C Hamano1-1/+1
2005-11-23git-merge: make recursive the default strategyJunio C Hamano1-8/+12
2005-11-09Use 'merge-base --all' where applicable.Junio C Hamano1-2/+9
2005-11-03Add 'ours' merge strategy.Junio C Hamano1-1/+1
2005-11-03Add --no-commit to git-merge/git-pull.Junio C Hamano1-10/+18
2005-10-28Documentation changes to recursive option for git-diff-treeChris Shoemaker1-1/+1
2005-10-22Allow git-merge not to commit.Junio C Hamano1-11/+17
2005-10-03[PATCH] Enable and fix support for base less merges.Fredrik Kuivinen1-2/+2
2005-10-02Handle really trivial case inside git-merge.Junio C Hamano1-1/+21
2005-09-28Use git-update-ref in scripts.Junio C Hamano1-4/+5
2005-09-28Fastpath the normal case by not checking that index matches HEAD.Junio C Hamano1-7/+4
2005-09-26Give default merge message after failed automerge.Junio C Hamano1-4/+10
2005-09-26Fix overzealous cleanliness check in git-mergeJunio C Hamano1-18/+50
2005-09-25[PATCH] More descriptive messages for conflict cases in mergesFredrik Kuivinen1-3/+4
2005-09-13[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen1-2/+2
2005-09-12Fix off-by-one error in git-mergeJunio C Hamano1-1/+1
2005-09-10Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano1-1/+1
2005-09-10Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano1-3/+3
2005-09-10Multi-backend merge driver.Junio C Hamano1-0/+212
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-04 16:15:44 +0000