aboutsummaryrefslogtreecommitdiff
path: root/git-resolve-script
Commit message (Expand)AuthorAge
* Try to find the optimum merge base while resolving.Junio C Hamano2005-08-23
* git-resolve: dying is good, not showing help is bad.Junio C Hamano2005-08-20
* [PATCH] Make sure git-resolve-script always works on commitsLinus Torvalds2005-08-13
* [PATCH] Audit rev-parse users.Junio C Hamano2005-07-22
* Make "git resolve" take the merge message in $3Linus Torvalds2005-07-08
* Add "git-sh-setup-script" for common git shell script setupLinus Torvalds2005-07-08
* Clean up different special *HEAD handlingLinus Torvalds2005-06-21
* [PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parseDan Holmsand2005-06-20
* Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.Linus Torvalds2005-06-19
* Trivial git script fixupsLinus Torvalds2005-06-14
* Make "git commit" work correctly in the presense of a manual mergeLinus Torvalds2005-06-08
* Make default merge messages denser.Linus Torvalds2005-06-08
* git-resolve-script: stop when the automated merge failsLinus Torvalds2005-06-06
* git-resolve-script: don't wait for three seconds any moreLinus Torvalds2005-06-06
* More work on merging with git-read-tree..Linus Torvalds2005-06-05
* git-read-tree: be a lot more careful about merging dirty treesLinus Torvalds2005-06-05
* git-resolve-script: use "git-apply --stat" instead of diffstatLinus Torvalds2005-05-30
* [PATCH] optimize git-resolve-scriptJeff Garzik2005-05-25
* Introduce GIT_DIR environment variable.Junio C Hamano2005-05-09
* Fix git-resolve-script.Linus Torvalds2005-05-05
* Split "git-pull-script" into two partsLinus Torvalds2005-05-05
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-03 06:28:10 +0000