Google Git
Sign in
googlers / jrn / git / 36f048c5e488005da0a9dfba6b617c7c9951c7cf / git-merge-octopus.sh
  1. 1c67d53 git-merge-octopus: do not capitalize "octopus" by Alex Henrie · 9 years ago
  2. d323c6b i18n: git-sh-setup.sh: mark strings for translation by Vasco Almeida · 9 years ago
  3. ff3b018 merge-octopus: use die shell function from git-sh-setup.sh by Vasco Almeida · 9 years ago
  4. 6a4eb91 i18n: merge-octopus: mark messages for translation by Vasco Almeida · 9 years ago
  5. 3ec62ad merge-octopus: abort if index does not match HEAD by Elijah Newren · 9 years ago
  6. 4e57baf merge-octopus: Work around environment issue on Windows by Johannes Schindelin · 15 years ago
  7. f08aa01 octopus: remove dead code by Stephen Boyd · 15 years ago
  8. 85bf49f octopus: reenable fast-forward merges by Stephen Boyd · 15 years ago
  9. 8133450 octopus: make merge process simpler to follow by Stephen Boyd · 15 years ago
  10. c5dc9a2 git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge by Junio C Hamano · 17 years ago
  11. 5be6007 Rewrite "git-frotz" to "git frotz" by Junio C Hamano · 18 years ago
  12. 1b1fdf8 read-tree --aggressive by Junio C Hamano · 19 years ago
  13. 98efc8f octopus: allow manual resolve on the last round. by Junio C Hamano · 19 years ago
  14. c884dd9 octopus: allow criss-cross and clarify the message when it rejects by Junio C Hamano · 19 years ago
  15. d165fa1 define die() for scripts that use it. by Junio C Hamano · 19 years ago
  16. 17cf939 octopus: do not do AND'ed merge base. by Junio C Hamano · 19 years ago
  17. 91063bb Multi-backend merge driver. by Junio C Hamano · 20 years ago