Google Git
Sign in
googlers / jrn / git / f3a3214e83be2905c57eff5d9035d169cae4644e / git-resolve-script
  1. 6b38a40 Clean up different special *HEAD handling by Linus Torvalds · 20 years ago
  2. c591412 [PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse by Dan Holmsand · 20 years ago
  3. 55a716c Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges. by Linus Torvalds · 20 years ago
  4. 40d8cfe Trivial git script fixups by Linus Torvalds · 20 years ago
  5. 9c06531 Make "git commit" work correctly in the presense of a manual merge by Linus Torvalds · 20 years ago
  6. 5b1ea09 Make default merge messages denser. by Linus Torvalds · 20 years ago
  7. e5b905c git-resolve-script: stop when the automated merge fails by Linus Torvalds · 20 years ago
  8. 3f4eff7 git-resolve-script: don't wait for three seconds any more by Linus Torvalds · 20 years ago
  9. 220a0b5 More work on merging with git-read-tree.. by Linus Torvalds · 20 years ago
  10. 02ede67 git-read-tree: be a lot more careful about merging dirty trees by Linus Torvalds · 20 years ago
  11. 866b973 git-resolve-script: use "git-apply --stat" instead of diffstat by Linus Torvalds · 20 years ago
  12. ea88ee4 [PATCH] optimize git-resolve-script by Jeff Garzik · 20 years ago
  13. 8ac069a Introduce GIT_DIR environment variable. by Junio C Hamano · 20 years ago
  14. d5a72fd Fix git-resolve-script. by Linus Torvalds · 20 years ago
  15. 67cc5c4 Split "git-pull-script" into two parts by Linus Torvalds · 20 years ago