index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t7602-merge-octopus-many.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2021-12-13
t6000-t9999: detect and signal failure within loop
Eric Sunshine
1
-1
/
+1
2021-12-13
tests: fix broken &&-chains in compound statements
Eric Sunshine
1
-1
/
+1
2021-02-10
tests: remove most uses of test_i18ncmp
Ævar Arnfjörð Bjarmason
1
-3
/
+3
2020-10-26
merge tests: expect slight differences in output for recursive vs. ort
Elijah Newren
1
-0
/
+6
2016-01-08
t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substit...
Elia Pinto
1
-4
/
+4
2012-04-30
diff --stat: use less columns for change counts
Zbigniew Jędrzejewski-Szmek
1
-6
/
+6
2012-04-27
Merge branch 'jc/merge-reduce-parents-early'
Junio C Hamano
1
-5
/
+3
2012-04-17
builtin/merge.c: reduce parents early
Junio C Hamano
1
-1
/
+1
2012-04-17
merge tests: octopus with redundant parents
Michał Kiedrowicz
1
-6
/
+4
2012-03-13
test: use test_i18ncmp when checking --stat output
Jonathan Nieder
1
-3
/
+3
2012-02-03
Use correct grammar in diffstat summary line
Nguyễn Thái Ngọc Duy
1
-3
/
+3
2011-05-25
merge: reword the final message
Junio C Hamano
1
-3
/
+3
2010-11-09
tests: add missing &&
Jonathan Nieder
1
-1
/
+1
2009-12-13
octopus: reenable fast-forward merges
Stephen Boyd
1
-0
/
+18
2009-12-13
octopus: make merge process simpler to follow
Stephen Boyd
1
-0
/
+33
2008-09-03
tests: use "git xyzzy" form (t7200 - t9001)
Nanako Shiraishi
1
-1
/
+1
2008-07-07
Build in merge
Miklos Vajna
1
-1
/
+1
2008-06-30
Add new test to ensure git-merge handles more than 25 refs.
Miklos Vajna
1
-0
/
+52