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
Avery Pennarun
Qu
i
c
k
test script
for g
e
nerating
r
easonably
complex
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pe
n
narun
Skip over
empt
y
c
ommits
.
commit
|
commitdiff
|
tree
2009-04-24
A
ve
r
y
Pennarun
Hm
m
.
.
.
can't actually filter
rev-list on the subdir
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Added a --onto o
p
tion, bu
t
it
'
s so compl
i
c
ated I can
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
U
s
e information abo
u
t prior
s
plits to make sure merges
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Add
a n
e
w --r
e
join op
t
ion
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Prin
t
out the newly created commit
i
d at the end
,
for
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Penn
a
run
We now
copy the
oth
e
r stuff
a
bout a commit (changelog
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery
P
ennarun
'git
s
ubtree s
p
lit' n
o
w basic
a
lly works
.
commit
|
commitdiff
|
tree
2009-04-24
A
very Penn
a
run
basi
c
o
pt
i
ons
p
arsing and what
n
ot
.
commit
|
commitdiff
|
tree