index
:
git
main
maint
master
next
seen
todo
Git: sistema de control de versiones
mirror
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t7602-merge-octopus-many.sh
Age
Commit message (
Expand
)
Author
2020-10-26
merge tests: expect slight differences in output for recursive vs. ort
Elijah Newren
2016-01-08
t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substit...
Elia Pinto
2012-04-30
diff --stat: use less columns for change counts
Zbigniew Jędrzejewski-Szmek
2012-04-27
Merge branch 'jc/merge-reduce-parents-early'
Junio C Hamano
2012-04-18
builtin/merge.c: reduce parents early
Junio C Hamano
2012-04-18
merge tests: octopus with redundant parents
Michał Kiedrowicz
2012-03-13
test: use test_i18ncmp when checking --stat output
Jonathan Nieder
2012-02-04
Use correct grammar in diffstat summary line
Nguyễn Thái Ngọc Duy
2011-05-25
merge: reword the final message
Junio C Hamano
2010-11-09
tests: add missing &&
Jonathan Nieder
2009-12-14
octopus: reenable fast-forward merges
Stephen Boyd
2009-12-14
octopus: make merge process simpler to follow
Stephen Boyd
2008-09-03
tests: use "git xyzzy" form (t7200 - t9001)
Nanako Shiraishi
2008-07-08
Build in merge
Miklos Vajna
2008-07-01
Add new test to ensure git-merge handles more than 25 refs.
Miklos Vajna