 Junio C Hamano
|
8e36002add
Merge branch 'ma/up-to-date'
|
8 years ago |
 Martin Ågren
|
7560f547e6
treewide: correct several "up-to-date" to "up to date"
|
8 years ago |
 Michael Forney
|
974ce8078c
scripts: use "git foo" not "git-foo"
|
8 years ago |
 Alex Henrie
|
1c67d534d9
git-merge-octopus: do not capitalize "octopus"
|
9 years ago |
 Vasco Almeida
|
d323c6b641
i18n: git-sh-setup.sh: mark strings for translation
|
9 years ago |
|
Vasco Almeida
|
ff3b018d2f
merge-octopus: use die shell function from git-sh-setup.sh
|
9 years ago |
|
Vasco Almeida
|
6a4eb91a73
i18n: merge-octopus: mark messages for translation
|
9 years ago |
 Elijah Newren
|
3ec62ad9ff
merge-octopus: abort if index does not match HEAD
|
9 years ago |
 Johannes Schindelin
|
4e57bafe8b
merge-octopus: Work around environment issue on Windows
|
15 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 |
|
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.
|
20 years ago |
|
Junio C Hamano
|
91063bbc6c
Multi-backend merge driver.
|
20 years ago |
