Sign in
googlers
/
jrn
/
git
/
4216329457926de0d977975fe9e3eef97a08be54
/
t
/
t7602-merge-octopus-many.sh
716a6b2
merge: free result of repo_get_merge_bases()
by Jeff King
· 1 year, 4 months ago
0c51d6b
t6000-t9999: detect and signal failure within loop
by Eric Sunshine
· 3 years, 1 month ago
74d2f56
tests: fix broken &&-chains in compound statements
by Eric Sunshine
· 3 years, 1 month ago
1108cea
tests: remove most uses of test_i18ncmp
by Ævar Arnfjörð Bjarmason
· 4 years ago
c8c35f6
merge tests: expect slight differences in output for recursive vs. ort
by Elijah Newren
· 4 years, 3 months ago
cf60c8f
t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substitution
by Elia Pinto
· 9 years ago
dc801e7
diff --stat: use less columns for change counts
by Zbigniew Jędrzejewski-Szmek
· 13 years ago
283097e
Merge branch 'jc/merge-reduce-parents-early'
by Junio C Hamano
· 13 years ago
e78cbf8
builtin/merge.c: reduce parents early
by Junio C Hamano
· 13 years ago
833abdc
merge tests: octopus with redundant parents
by Michał Kiedrowicz
· 13 years ago
fc5877a
test: use test_i18ncmp when checking --stat output
by Jonathan Nieder
· 13 years ago
7f81463
Use correct grammar in diffstat summary line
by Nguyễn Thái Ngọc Duy
· 13 years ago
f23101b
merge: reword the final message
by Junio C Hamano
· 14 years ago
a48fcd8
tests: add missing &&
by Jonathan Nieder
· 14 years ago
85bf49f
octopus: reenable fast-forward merges
by Stephen Boyd
· 15 years ago
8133450
octopus: make merge process simpler to follow
by Stephen Boyd
· 15 years ago
47a528a
tests: use "git xyzzy" form (t7200 - t9001)
by Nanako Shiraishi
· 16 years ago
1c7b76b
Build in merge
by Miklos Vajna
· 17 years ago
5948e2a
Add new test to ensure git-merge handles more than 25 refs.
by Miklos Vajna
· 17 years ago