summaryrefslogtreecommitdiff
path: root/git-resolve-script
Commit message (Expand)AuthorAgeFilesLines
* Clean up different special *HEAD handlingLinus Torvalds2005-06-211-2/+2
* [PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parseDan Holmsand2005-06-201-9/+15
* Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.Linus Torvalds2005-06-191-1/+3
* Trivial git script fixupsLinus Torvalds2005-06-141-0/+0
* Make "git commit" work correctly in the presense of a manual mergeLinus Torvalds2005-06-081-1/+2
* Make default merge messages denser.Linus Torvalds2005-06-081-2/+1
* git-resolve-script: stop when the automated merge failsLinus Torvalds2005-06-061-1/+5
* git-resolve-script: don't wait for three seconds any moreLinus Torvalds2005-06-061-3/+0
* More work on merging with git-read-tree..Linus Torvalds2005-06-051-4/+2
* git-read-tree: be a lot more careful about merging dirty treesLinus Torvalds2005-06-051-2/+3
* git-resolve-script: use "git-apply --stat" instead of diffstatLinus Torvalds2005-05-301-2/+2
* [PATCH] optimize git-resolve-scriptJeff Garzik2005-05-251-2/+2
* Introduce GIT_DIR environment variable.Junio C Hamano2005-05-091-5/+10
* Fix git-resolve-script.Linus Torvalds2005-05-051-1/+1
* Split "git-pull-script" into two partsLinus Torvalds2005-05-051-0/+56
View Lorry Controller Status