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
A
v
ery Pennarun
man page: ad
d
an EXAM
P
LES s
e
ction
.
commit
|
commitdiff
|
tree
2009-05-30
Ave
r
y Pennarun
Add basic git-subtree manpage in
asciidoc format
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
Mak
e
-
-
squash work with th
e
'add
'
c
o
mmand too
.
commit
|
commitdiff
|
tree
2009-05-30
A
very
Pe
n
nar
u
n
Fi
x
sp
l
itting
a
fter usin
g
a squash merge
.
commit
|
commitdiff
|
tree
2009-05-30
A
v
ery Pennaru
n
Don't
s
q
u
ash
-
merge if th
e
old and ne
w
commits are the
.
.
.
commit
|
commitdiff
|
tree
2009-05-30
Av
e
ry
Pennarun
Basic "su
b
t
ree merge --squash" s
u
pport
.
commit
|
commitdiff
|
tree
2009-05-30
Avery
Pennarun
merge_msg(
)
is
r
eally
m
ore like rejoin_m
s
g
(
)
.
commit
|
commitdiff
|
tree
2009-05-30
A
v
e
ry
P
ennarun
F
I
X
M
E help
f
or --squash o
p
tion
commit
|
commitdiff
|
tree
2009-05-30
Aver
y
Pe
n
narun
slightly rear
r
ange help
m
essag
e
for
spli
t
.
commit
|
commitdiff
|
tree
2009-05-30
Ave
r
y Pennarun
New --branch option to s
p
lit co
m
mand
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
t
y
po in comment
commit
|
commitdiff
|
tree
2009-05-24
A
ve
r
y Pennarun
More to-d
o
it
e
m
s
base
d
on f
e
edback
commit
|
commitdiff
|
tree
2009-05-01
Avery Pennarun
Ab
o
rt if --rejoin fails
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
debug messages are off by def
a
ult; use -d to
e
nable
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennaru
n
test
.
s
h:
o
ops, never intended to
c
oun
t
the
r
aw numbe
r
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennar
u
n
Simplify merge
s
even mo
r
e
aggressively
.
commit
|
commitdiff
|
tree
2009-04-26
Aver
y
P
e
nna
r
un
t
est
.
sh:
mak
e
sure no commit change
s
more
th
a
n o
n
e
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
A
v
ery Pennarun
On
l
y copy
a
c
ommit if it has
at
lea
s
t o
n
e nonid
e
ntica
l
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
A
v
ery Pennarun
Trim some e
x
tra merge c
o
mmits
tha
t
don't need to go
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Av
e
ry Pennarun
test
.
s
h
tweak
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
Add some ba
s
ic a
s
sertions to test
.
sh
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Penna
r
un
A
dd
a
'
c
reate' help
e
r
functio
n
in
t
e
st
.
s
h
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
Cl
a
rify why
w
e c
a
n't do 'git r
e
v-lis
t
'
with a pa
t
h
.
commit
|
commitdiff
|
tree
2009-04-26
Ave
r
y Pennar
u
n
T
y
po
when s
e
arching f
o
r exist
i
ng splits
.
commit
|
commitdiff
|
tree
2009-04-26
Ave
r
y Penn
a
run
Add --annot
a
te option, an
d
create recognizable fi
l
e
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
todo
list
commit
|
commitdiff
|
tree
2009-04-25
Avery Pe
n
narun
Change test
.
sh to test
the ne
w
add, merge, an
d
p
u
ll
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Handle it s
u
ccessfully
i
f a given parent commit has
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennaru
n
Add 'git s
u
b
tree merge' and 'git
sub
t
ree pull'
.
commit
|
commitdiff
|
tree
2009-04-25
Av
e
ry Pe
n
nar
u
n
Add a new
'
git s
u
btree add' command for addi
n
g subtr
e
es
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
A
v
ery Pennarun
P
ass the
path usin
g
the --pr
e
fix option
instead of
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
A
very Pennarun
Okay, that wa
s
a little too ag
g
ressive
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Ev
e
n mor
e
a
ggressive co
m
mit
t
r
imming
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennar
u
n
P
r
une out some extra
m
erge commits
by
comparing
t
heir
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Quick test scr
i
p
t
for generating r
e
asonably complex
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
A
v
ery Pe
n
narun
Skip over empty commits
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Hmm
.
.
.
can't actually
f
ilter rev-list on the subdir
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Added
a
--o
n
t
o option, but
i
t's so complicated
I
can
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Ave
r
y P
e
nnarun
Use i
n
formation abo
u
t
prior splits to
make sure merges
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
A
very Penn
a
run
Ad
d
a new --rejoin option
.
commit
|
commitdiff
|
tree
2009-04-24
Aver
y
P
e
nna
r
un
Prin
t
ou
t
t
h
e newly created commitid at the end, for
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennaru
n
We now cop
y
the other stuff about
a
c
ommit (c
h
angelog
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery
P
ennarun
'git
s
u
btree split' now basically
w
orks
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pen
n
arun
basic o
p
tions p
a
r
s
i
ng and w
h
atnot
.
commit
|
commitdiff
|
tree