| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Make "git commit" work correctly in the presense of a manual merge | Linus Torvalds | 2005-06-08 | 1 | -1/+2 |
| * | Make default merge messages denser. | Linus Torvalds | 2005-06-08 | 1 | -2/+1 |
| * | git-resolve-script: stop when the automated merge fails | Linus Torvalds | 2005-06-06 | 1 | -1/+5 |
| * | git-resolve-script: don't wait for three seconds any more | Linus Torvalds | 2005-06-06 | 1 | -3/+0 |
| * | More work on merging with git-read-tree.. | Linus Torvalds | 2005-06-05 | 1 | -4/+2 |
| * | git-read-tree: be a lot more careful about merging dirty trees | Linus Torvalds | 2005-06-05 | 1 | -2/+3 |
| * | git-resolve-script: use "git-apply --stat" instead of diffstat | Linus Torvalds | 2005-05-30 | 1 | -2/+2 |
| * | [PATCH] optimize git-resolve-script | Jeff Garzik | 2005-05-25 | 1 | -2/+2 |
| * | Introduce GIT_DIR environment variable. | Junio C Hamano | 2005-05-09 | 1 | -5/+10 |
| * | Fix git-resolve-script. | Linus Torvalds | 2005-05-05 | 1 | -1/+1 |
| * | Split "git-pull-script" into two parts | Linus Torvalds | 2005-05-05 | 1 | -0/+56 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/git-resolve-script