Google Git
Sign in
googlers / jrn / git / f028cdae6663166ebfd777e73aacce1f5e7159d6 / git-merge-octopus.sh
  1. f08aa01 octopus: remove dead code by Stephen Boyd · 15 years ago
  2. 85bf49f octopus: reenable fast-forward merges by Stephen Boyd · 15 years ago
  3. 8133450 octopus: make merge process simpler to follow by Stephen Boyd · 15 years ago
  4. c5dc9a2 git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge by Junio C Hamano · 17 years ago
  5. 5be6007 Rewrite "git-frotz" to "git frotz" by Junio C Hamano · 18 years ago
  6. 1b1fdf8 read-tree --aggressive by Junio C Hamano · 19 years ago
  7. 98efc8f octopus: allow manual resolve on the last round. by Junio C Hamano · 19 years ago
  8. c884dd9 octopus: allow criss-cross and clarify the message when it rejects by Junio C Hamano · 19 years ago
  9. d165fa1 define die() for scripts that use it. by Junio C Hamano · 19 years ago
  10. 17cf939 octopus: do not do AND'ed merge base. by Junio C Hamano · 19 years ago
  11. 91063bb Multi-backend merge driver. by Junio C Hamano · 20 years ago