summaryrefslogtreecommitdiff
path: root/git-merge.sh
AgeCommit message (Expand)AuthorFilesLines
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
2006-03-09allow double click on current HEAD id after git-pullLibravatar Olaf Hering1-1/+1
2006-02-23Merge fixes early for next maint series.Libravatar Junio C Hamano1-2/+2
2006-02-22checkout - eye candy.Libravatar Junio C Hamano1-2/+2
2006-02-22Keep Porcelainish from failing by broken ident after making changes.Libravatar Junio C Hamano1-0/+5
2006-02-21Merge part of jc/portable branchLibravatar Junio C Hamano1-0/+4
2006-02-18Optionally work without pythonLibravatar Johannes Schindelin1-0/+4
2006-02-18Keep Porcelainish from failing by broken ident after making changes.Libravatar Junio C Hamano1-0/+5
2006-02-11Only call git-rerere if $GIT_DIR/rr-cache exists.Libravatar Junio C Hamano1-1/+4
2006-02-06git-rerere: reuse recorded resolve.Libravatar Junio C Hamano1-0/+1
2006-02-03git-merge: Properly quote $merge_msg variable.Libravatar Junio C Hamano1-1/+1
2006-01-27merge: seed the commit message with list of conflicted files.Libravatar Junio C Hamano1-0/+8
2005-12-23merge --no-commit: tweak messageLibravatar Junio C Hamano1-1/+10
2005-12-14Trivial usage string clean-upLibravatar freku045@student.liu.se1-4/+2
2005-12-13[PATCH] allow merging any committishLibravatar Junio C Hamano1-1/+4
2005-12-03git-merge: Exit with code 2 if no strategy was able to handle the merge.Libravatar Fredrik Kuivinen1-1/+2
2005-11-25git-sh-setup: die if outside git repository.Libravatar Junio C Hamano1-1/+1
2005-11-23git-merge: make recursive the default strategyLibravatar Junio C Hamano1-8/+12
2005-11-09Use 'merge-base --all' where applicable.Libravatar Junio C Hamano1-2/+9
2005-11-03Add 'ours' merge strategy.Libravatar Junio C Hamano1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 05:50:13 +0000