path: root/
AgeCommit message (Expand)Author
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
2006-04-19git-merge: a bit more readable user guidance.Junio C Hamano
2006-03-20git-merge knows some strategies want to skip trivial mergesJunio C Hamano
2006-03-10allow double click on current HEAD id after git-pullOlaf Hering
2006-02-24Merge fixes early for next maint series.Junio C Hamano
2006-02-23checkout - eye candy.Junio C Hamano
2006-02-22Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano
2006-02-21Merge part of jc/portable branchJunio C Hamano
2006-02-19Optionally work without pythonJohannes Schindelin
2006-02-19Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano
2006-02-12Only call git-rerere if $GIT_DIR/rr-cache exists.Junio C Hamano
2006-02-07git-rerere: reuse recorded resolve.Junio C Hamano
2006-02-04git-merge: Properly quote $merge_msg variable.Junio C Hamano
2006-01-28merge: seed the commit message with list of conflicted files.Junio C Hamano
2005-12-23merge --no-commit: tweak messageJunio C Hamano
2005-12-14Trivial usage string
2005-12-14[PATCH] allow merging any committishJunio C Hamano
2005-12-03git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen
2005-11-25git-sh-setup: die if outside git repository.Junio C Hamano
2005-11-24git-merge: make recursive the default strategyJunio C Hamano
2005-11-10Use 'merge-base --all' where applicable.Junio C Hamano
2005-11-03Add 'ours' merge strategy.Junio C Hamano
2005-11-03Add --no-commit to git-merge/git-pull.Junio C Hamano
2005-10-28Documentation changes to recursive option for git-diff-treeChris Shoemaker
2005-10-22Allow git-merge not to commit.Junio C Hamano
2005-10-03[PATCH] Enable and fix support for base less merges.Fredrik Kuivinen
2005-10-02Handle really trivial case inside git-merge.Junio C Hamano
2005-09-28Use git-update-ref in scripts.Junio C Hamano