12 Commits (ae2f203ef7be7b33ff5ec61646c8662363eccd62)

Author SHA1 Message Date
Johannes Schindelin 4e57bafe8b merge-octopus: Work around environment issue on Windows 14 years ago
Stephen Boyd f08aa01767 octopus: remove dead code 15 years ago
Stephen Boyd 85bf49f9a5 octopus: reenable fast-forward merges 15 years ago
Stephen Boyd 81334502ee octopus: make merge process simpler to follow 15 years ago
Felipe Contreras a75d7b5409 Use 'fast-forward' all over the place 15 years ago
Junio C Hamano c5dc9a2829 git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge 17 years ago
Junio C Hamano 5be60078c9 Rewrite "git-frotz" to "git frotz" 18 years ago
Junio C Hamano 1b1fdf8c2f read-tree --aggressive 19 years ago
Junio C Hamano 98efc8f3d8 octopus: allow manual resolve on the last round. 19 years ago
Junio C Hamano c884dd9a54 octopus: allow criss-cross and clarify the message when it rejects 19 years ago
Junio C Hamano d165fa14f0 define die() for scripts that use it. 19 years ago
Junio C Hamano 17cf939724 octopus: do not do AND'ed merge base. 19 years ago
Junio C Hamano 91063bbc6c Multi-backend merge driver. 20 years ago