repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Quick test script for generating reasonably complex merge scenarios.
2009-04-25
A
very Pennarun
Q
u
ick test scr
i
pt for generating
r
e
a
sonably co
m
ple
x
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
S
k
ip over em
p
t
y
comm
i
ts
.
commit
|
commitdiff
|
tree
2009-04-24
A
very Penn
a
run
Hm
m
.
.
.
can
'
t actually filte
r
rev-
l
ist on the subdir
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pen
n
a
run
Ad
d
ed a --onto option, but it's s
o
complicated I ca
n
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pen
n
a
run
Use info
r
mat
i
on about prior splits to make sure merges
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Ave
r
y Pennarun
Add a n
e
w -
-
r
e
j
o
i
n op
t
ion
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Penn
a
r
u
n
Pri
n
t out the ne
w
ly cr
e
ate
d
commit
i
d at
the
end, for
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
We
n
o
w
copy
the o
t
her stuff about a commit (changelog
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
'
g
it
s
ubtree s
p
li
t
' n
o
w basic
a
lly works
.
commit
|
commitdiff
|
tree
2009-04-24
Avery
Pennarun
basic
option
s
parsing and whatnot
.
commit
|
commitdiff
|
tree