summaryrefslogtreecommitdiff
path: root/git-resolve-script
AgeCommit message (Expand)Author
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