summaryrefslogtreecommitdiff
path: root/git-resolve-script
AgeCommit message (Expand)Author
2005-09-08Big tool rename.Junio C Hamano
2005-09-02scripts: equality test '==' is not portable.Junio C Hamano
2005-08-24Try to find the optimum merge base while resolving.Junio C Hamano
2005-08-20git-resolve: dying is good, not showing help is bad.Junio C Hamano
2005-08-14[PATCH] Make sure git-resolve-script always works on commitsLinus Torvalds
2005-07-23[PATCH] Audit rev-parse users.Junio C Hamano
2005-07-09Make "git resolve" take the merge message in $3Linus Torvalds
2005-07-08Add "git-sh-setup-script" for common git shell script setupLinus Torvalds
2005-06-21Clean up different special *HEAD handlingLinus Torvalds
2005-06-20[PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parseDan Holmsand
2005-06-20Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.Linus Torvalds
2005-06-15Trivial git script fixupsLinus Torvalds
2005-06-08Make "git commit" work correctly in the presense of a manual mergeLinus Torvalds
2005-06-08Make default merge messages denser.Linus Torvalds
2005-06-07git-resolve-script: stop when the automated merge failsLinus Torvalds
2005-06-07git-resolve-script: don't wait for three seconds any moreLinus Torvalds
2005-06-06More work on merging with git-read-tree..Linus Torvalds
2005-06-06git-read-tree: be a lot more careful about merging dirty treesLinus Torvalds
2005-05-31git-resolve-script: use "git-apply --stat" instead of diffstatLinus Torvalds
2005-05-25[PATCH] optimize git-resolve-scriptJeff Garzik
2005-05-10Introduce GIT_DIR environment variable.Junio C Hamano
2005-05-05Fix git-resolve-script.Linus Torvalds
2005-05-05Split "git-pull-script" into two partsLinus Torvalds