Google Git
Sign in
googlers / jrn / git / e6e2bd6201d32342df7a713c847161ab296885ea / git-merge-octopus.sh
  1. 1b1fdf8 read-tree --aggressive by Junio C Hamano · 19 years ago
  2. 98efc8f octopus: allow manual resolve on the last round. by Junio C Hamano · 19 years ago
  3. c884dd9 octopus: allow criss-cross and clarify the message when it rejects by Junio C Hamano · 19 years ago
  4. d165fa1 define die() for scripts that use it. by Junio C Hamano · 19 years ago
  5. 17cf939 octopus: do not do AND'ed merge base. by Junio C Hamano · 19 years ago
  6. 91063bb Multi-backend merge driver. by Junio C Hamano · 20 years ago