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