summaryrefslogtreecommitdiff
path: root/git-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-36/+36
2007-05-29Merge branch 'ar/mergestat'Libravatar Junio C Hamano1-6/+12
2007-05-26Merge branch 'maint'Libravatar Junio C Hamano1-3/+3
2007-05-26Merge branch 'maint-1.5.1' into maintLibravatar Junio C Hamano1-3/+3
2007-05-26More echo "$user_message" fixes.Libravatar Jeff King1-3/+3
2007-05-24Add a configuration option to control diffstat after mergeLibravatar Alex Riesen1-6/+12
2007-05-10Add colour support in rebase and merge tree diff stats output.Libravatar James Bowes1-1/+2
2007-04-07A new merge stragety 'subtree'.Libravatar Junio C Hamano1-2/+2
2007-03-22git-merge: Put FETCH_HEAD data in merge commit messageLibravatar Michael S. Tsirkin1-0/+4
2007-03-16git-merge: finish when git-read-tree failsLibravatar Santi Béjar1-2/+2
2007-03-11git-merge: warn when -m provided on a fast forwardLibravatar J. Bruce Fields1-1/+6
2007-03-03git-merge: fail correctly when we cannot fast forward.Libravatar Junio C Hamano1-1/+1
2007-02-16git-merge: minor fix for no_trivial_merge_strategies.Libravatar Junio C Hamano1-6/+9
2007-01-28[PATCH] Rename git-repo-config to git-config.Libravatar Tom Prince1-2/+2
2007-01-26git-merge: leave sensible reflog message when used as the first level UI.Libravatar Junio C Hamano1-1/+1
2007-01-14Merge branch 'sp/merge' (early part)Libravatar Junio C Hamano1-17/+23
2007-01-12Allow whole-tree operations to be started from a subdirectoryLibravatar Junio C Hamano1-1/+3
2007-01-10Improve merge performance by avoiding in-index merges.Libravatar Shawn O. Pearce1-17/+23
2007-01-10Disallow working directory commands in a bare repository.Libravatar Shawn O. Pearce1-0/+1
2007-01-01fail pull/merge early in the middle of conflicted mergeLibravatar Junio C Hamano1-0/+3
2006-12-28Honor pull.{twohead,octopus} in git-merge.Libravatar Shawn O. Pearce1-2/+14
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Libravatar Shawn O. Pearce1-8/+5
2006-12-23Display 'theirs' branch name when possible in merge.Libravatar Shawn O. Pearce1-0/+2
2006-12-22merge and reset: adjust for "reset --hard" messagesLibravatar Junio C Hamano1-1/+1
2006-12-16merge: give a bit prettier merge message to "merge branch~$n"Libravatar Junio C Hamano1-9/+17
2006-12-13Merge branch 'jc/read-tree-ignore'Libravatar Junio C Hamano1-1/+1
2006-12-13git merge: reword failure message.Libravatar Junio C Hamano1-1/+8
2006-12-06git-merge: fix "fix confusion between tag and branch" for realLibravatar Junio C Hamano1-2/+3
2006-12-06git-merge: squelch needless error message.Libravatar Junio C Hamano1-1/+1
2006-12-05Loosen "working file will be lost" check in Porcelain-ishLibravatar Junio C Hamano1-1/+1
2006-12-02git-merge: fix confusion between tag and branchLibravatar Junio C Hamano1-5/+5
2006-11-26git-merge: do not leak rev-parse output used for checking internally.Libravatar Junio C Hamano1-1/+1
2006-11-26git-merge: tighten error checking.Libravatar Junio C Hamano1-3/+3
2006-11-21merge: allow merging into a yet-to-be-born branch.Libravatar Junio C Hamano1-0/+18
2006-11-21git-merge: make it usable as the first class UILibravatar Junio C Hamano1-7/+54
2006-11-21remove merge-recursive-oldLibravatar Junio C Hamano1-4/+1
2006-10-22Merge branch 'maint'Libravatar Junio C Hamano1-0/+2
2006-10-22git-merge: show usage if run without argumentsLibravatar Rene Scharfe1-0/+2
2006-09-30merge and resolve: Output short hashes and .. in "Updating ..."Libravatar Santi Béjar1-1/+1
2006-09-24Deprecate merge-recursive.pyLibravatar Junio C Hamano1-13/+3
2006-07-30Merge branch 'js/read-tree' into js/c-merge-recursiveLibravatar Junio C Hamano1-3/+14
2006-07-13recur vs recursive: help testing without touching too many stuff.Libravatar Junio C Hamano1-2/+11
2006-07-13Status update on merge-recursive in CLibravatar Johannes Schindelin1-3/+3
2006-07-11Log ref changes made by git-merge and git-pull.Libravatar Shawn Pearce1-3/+14
2006-06-27Fix expr usage for FreeBSDLibravatar Dennis Stosberg1-1/+1
2006-06-24git-merge --squashLibravatar Junio C Hamano1-19/+53
2006-06-23git-merge: Don't use -p when outputting summaryLibravatar Timo Hirvonen1-1/+1
2006-05-14Convert some "apply --summary" users to "diff --summary".Libravatar Sean1-2/+1
2006-04-19git-merge: a bit more readable user guidance.Libravatar Junio C Hamano1-1/+1
2006-03-20git-merge knows some strategies want to skip trivial mergesLibravatar Junio C Hamano1-27/+40
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 02:59:29 +0000