18 Commits (89ab859e9452cbc8f1f15afab52257e9b789c899)

Author SHA1 Message Date
Junio C Hamano f6e1a4d6dc [PATCH] Audit rev-parse users. 20 years ago
Linus Torvalds 3ba513c32e Make "git resolve" take the merge message in $3 20 years ago
Linus Torvalds b33e966608 Add "git-sh-setup-script" for common git shell script setup 20 years ago
Linus Torvalds 6b38a402e9 Clean up different special *HEAD handling 20 years ago
Dan Holmsand c591412cc0 [PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse 20 years ago
Linus Torvalds 55a716cc8c Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges. 20 years ago
Linus Torvalds 40d8cfe411 Trivial git script fixups 20 years ago
Linus Torvalds 9c065315f7 Make "git commit" work correctly in the presense of a manual merge 20 years ago
Linus Torvalds 5b1ea09de1 Make default merge messages denser. 20 years ago
Linus Torvalds e5b905c448 git-resolve-script: stop when the automated merge fails 20 years ago
Linus Torvalds 3f4eff7530 git-resolve-script: don't wait for three seconds any more 20 years ago
Linus Torvalds 220a0b527b More work on merging with git-read-tree.. 20 years ago
Linus Torvalds 02ede67ad4 git-read-tree: be a lot more careful about merging dirty trees 20 years ago
Linus Torvalds 866b973b5d git-resolve-script: use "git-apply --stat" instead of diffstat 20 years ago
Jeff Garzik ea88ee46de [PATCH] optimize git-resolve-script 20 years ago
Junio C Hamano 8ac069ac0a Introduce GIT_DIR environment variable. 20 years ago
Linus Torvalds d5a72fd622 Fix git-resolve-script. 20 years ago
Linus Torvalds 67cc5c4ef8 Split "git-pull-script" into two parts 20 years ago