summaryrefslogtreecommitdiff
path: root/git-resolve-script
AgeCommit message (Expand)AuthorFilesLines
2005-07-08Add "git-sh-setup-script" for common git shell script setupLibravatar Linus Torvalds1-9/+5
2005-06-21Clean up different special *HEAD handlingLibravatar Linus Torvalds1-2/+2
2005-06-20[PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parseLibravatar Dan Holmsand1-9/+15
2005-06-19Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.Libravatar Linus Torvalds1-1/+3
2005-06-14Trivial git script fixupsLibravatar Linus Torvalds1-0/+0
2005-06-08Make "git commit" work correctly in the presense of a manual mergeLibravatar Linus Torvalds1-1/+2
2005-06-08Make default merge messages denser.Libravatar Linus Torvalds1-2/+1
2005-06-06git-resolve-script: stop when the automated merge failsLibravatar Linus Torvalds1-1/+5
2005-06-06git-resolve-script: don't wait for three seconds any moreLibravatar Linus Torvalds1-3/+0
2005-06-05More work on merging with git-read-tree..Libravatar Linus Torvalds1-4/+2
2005-06-05git-read-tree: be a lot more careful about merging dirty treesLibravatar Linus Torvalds1-2/+3
2005-05-30git-resolve-script: use "git-apply --stat" instead of diffstatLibravatar Linus Torvalds1-2/+2
2005-05-25[PATCH] optimize git-resolve-scriptLibravatar Jeff Garzik1-2/+2
2005-05-09Introduce GIT_DIR environment variable.Libravatar Junio C Hamano1-5/+10
2005-05-05Fix git-resolve-script.Libravatar Linus Torvalds1-1/+1
2005-05-05Split "git-pull-script" into two partsLibravatar Linus Torvalds1-0/+56
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 08:00:27 +0000