repo.or.cz
/
git-subtree.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
man page: add an EXAMPLES section.
2009-05-30
Aver
y
Penn
a
run
man page: add an EXAMPLES sect
i
o
n
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
Add ba
s
ic git
-
s
ubtree man
p
age in
asciidoc forma
t
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
M
ake --squas
h
work wit
h
the
'
add' command
too
.
commit
|
commitdiff
|
tree
2009-05-30
A
v
e
r
y Pe
n
narun
F
ix split
t
ing after usi
n
g a squas
h
merge
.
commit
|
commitdiff
|
tree
2009-05-30
Avery
P
e
nnarun
Don't squash-merge if the old
and new c
o
mmi
t
s
ar
e
t
he
.
.
.
commit
|
commitdiff
|
tree
2009-05-30
Ave
r
y
P
ennarun
Basi
c
"subtree mer
g
e --squ
a
sh" su
p
port
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pe
n
narun
merge_msg()
i
s
r
eally more like rejoin_ms
g
(
)
.
commit
|
commitdiff
|
tree
2009-05-30
A
v
ery Pennar
u
n
FIXME help for --squa
s
h optio
n
commit
|
commitdiff
|
tree
2009-05-30
Aver
y
Pennarun
s
li
g
htl
y
rearrange
h
elp message for split
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Penna
r
un
New -
-
branch
option t
o
split comm
a
nd
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Penn
a
ru
n
typo
i
n comment
commit
|
commitdiff
|
tree
2009-05-24
Ave
r
y
Pennarun
Mo
r
e
to-do items based on fe
e
dba
c
k
commit
|
commitdiff
|
tree
2009-05-01
Avery
Pennarun
Ab
o
rt if --rejo
i
n fai
l
s
.
commit
|
commitdiff
|
tree
2009-04-26
Aver
y
Pennarun
d
e
b
u
g messa
g
e
s a
r
e
off b
y
d
efault; use -
d
to
e
na
b
le
.
commit
|
commitdiff
|
tree
2009-04-26
A
v
ery Pennarun
test
.
s
h
: oops, nev
e
r intende
d
to
c
ount the raw
number
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
Simplify merges
even more
aggressively
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Penn
a
run
te
s
t
.
s
h: make su
r
e no commit changes m
o
r
e
than one
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Aver
y
P
ennarun
O
n
ly cop
y
a
c
o
mmit if it ha
s
at least one non
i
dentical
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
Pennaru
n
Trim
s
o
me ex
t
ra merge c
o
mmits that don't need to go
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Av
e
ry P
e
nnarun
test
.
sh t
w
eak
commit
|
commitdiff
|
tree
2009-04-26
Ave
r
y Pennar
u
n
A
dd some basic as
s
e
r
tions to test
.
sh
.
commit
|
commitdiff
|
tree
2009-04-26
Aver
y
Pennarun
Add a 'create' helper function i
n
test
.
sh
.
commit
|
commitdiff
|
tree
2009-04-26
A
v
ery Penn
a
run
Clarify wh
y
we c
a
n't do 'git rev-list
'
with
a
path
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pen
n
arun
T
y
po w
h
en searchin
g
for existing splits
.
commit
|
commitdiff
|
tree
2009-04-26
Avery P
e
nnarun
Add -
-
annotate option, and cre
a
t
e recognizable
f
ile
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
todo
list
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
C
hange test
.
sh to test the
n
ew add, merge
,
an
d
pull
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Handle it successfully if a given p
a
re
n
t commit has
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Aver
y
Pennarun
A
dd 'g
i
t subtr
e
e merge' a
n
d
'g
i
t
subtree pull'
.
commit
|
commitdiff
|
tree
2009-04-25
Avery
P
en
n
ar
u
n
Add a
n
ew 'g
i
t subtree add' command for adding subtrees
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Pass the pa
t
h using the --prefix
o
ption i
n
stead of
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Aver
y
Pennaru
n
Okay, th
a
t was a little too aggr
e
ssive
.
commit
|
commitdiff
|
tree
2009-04-25
Av
e
ry Pennarun
Even more
aggres
s
ive
c
ommi
t
tri
m
ming
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Prune out some extra
merge commi
t
s by comparing their
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
A
v
ery
P
e
nnarun
Quick
t
est script for generating reason
a
bl
y
c
omplex
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
A
v
e
r
y
P
e
nna
r
un
Skip over
empty c
o
mmits
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennar
u
n
Hmm
.
.
.
can't actuall
y
filter rev-list on the subd
i
r
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Added
a
--onto
o
ption
,
but it's so complicated
I
can
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
A
very Pennar
u
n
Use information about p
r
io
r
splits to make sure merges
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Add a new --r
e
j
oi
n
option
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennar
u
n
Prin
t
out t
h
e new
l
y created co
m
m
i
tid at
t
h
e
end, for
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Aver
y
P
ennarun
We now
c
opy the oth
e
r
s
t
uff abo
u
t a c
o
mmit (changelog
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Penn
a
run
'g
i
t subt
r
ee
s
plit' now basically works
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pen
n
arun
basi
c
options pars
i
ng
a
nd whatnot
.
commit
|
commitdiff
|
tree