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
Add some tips for how to install.
2009-11-04
Avery Pennarun
Add some tips f
o
r how
t
o install
.
commit
|
commitdiff
|
tree
2009-10-02
Aver
y
Pennarun
cm
d
_pull didn't support --squash cor
r
ec
t
ly
.
commit
|
commitdiff
|
tree
2009-10-02
Ave
r
y Pennarun
F
i
x a m
i
nor
p
roblem in identifying squ
a
shes vs
.
normal
.
.
.
commit
|
commitdiff
|
tree
2009-10-02
A
very Penna
r
un
I
f
someone p
r
ovides a -
-
p
refix tha
t
e
nds with
s
las
h
.
.
.
commit
|
commitdiff
|
tree
2009-10-02
A
v
e
r
y
P
enn
a
run
M
erge b
r
a
nch 'm
a
ster' of
g
i
t
:/
/
git
h
ub
.
co
m
/voxpe
l
l
i
.
.
.
commit
|
commitdiff
|
tree
2009-10-02
Avery
Pennarun
Add a REA
D
ME that says to em
a
il me instead
o
f
u
si
n
g
.
.
.
commit
|
commitdiff
|
tree
2009-08-26
A
v
er
y
Pen
n
arun
Fix behaviour
i
f you ha
v
e a branch
named the same as
.
.
.
commit
|
commitdiff
|
tree
2009-08-26
Avery Pennar
u
n
Improve patch to use g
i
t --exec-p
a
t
h: add to
PATH inst
e
ad
.
commit
|
commitdiff
|
tree
2009-08-20
kTln2
Ad
d
e
xplicit p
a
th of git i
n
stal
l
ation by 'git --exec
.
.
.
commit
|
commitdiff
|
tree
2009-08-02
Avery
P
enna
r
un
todo: idea for a 'git subtre
e
gr
a
fts' com
m
and
commit
|
commitdiff
|
tree
2009-08-01
A
very Pen
n
arun
todo
commit
|
commitdiff
|
tree
2009-07-16
Avery
P
ennarun
todo^
commit
|
commitdiff
|
tree
2009-07-10
A
v
e
r
y Pennarun
todo
commit
|
commitdiff
|
tree
2009-07-09
Avery Penna
r
un
Doc
s
: when p
u
shing t
o
github, the repo path needs to
.
.
.
commit
|
commitdiff
|
tree
2009-07-07
A
v
ery P
e
nnarun
tod
o
commit
|
commitdiff
|
tree
2009-07-02
Avery
Pe
n
nar
u
n
Some
t
odo it
e
m
s report
e
d
b
y pmccurd
y
commit
|
commitdiff
|
tree
2009-06-15
Avery Pennaru
n
up
d
ate todo
commit
|
commitdiff
|
tree
2009-05-30
A
very Pennarun
man page: add a
n
EXAMPLES section
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
A
dd basic git-subt
r
e
e manpage in asc
i
id
o
c format
.
commit
|
commitdiff
|
tree
2009-05-30
A
ver
y
Pennarun
Make
--squash work with
the 'add' command too
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennar
u
n
Fix splitting aft
e
r
u
sing a squash merge
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
Don'
t
squash
-
merge if the old and new commits are
t
h
e
.
.
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
Basic
"subt
r
ee merge --squash" support
.
commit
|
commitdiff
|
tree
2009-05-30
Avery
P
enn
a
run
m
e
rge_msg(
)
is r
e
al
l
y more
like
r
ejoin_msg()
.
commit
|
commitdiff
|
tree
2009-05-30
Aver
y
Pennaru
n
FIXME hel
p
for --squas
h
opt
i
on
commit
|
commitdiff
|
tree
2009-05-30
Avery Pen
n
a
run
sligh
t
l
y
rearrange help
m
e
ssage for s
p
lit
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Penn
a
ru
n
New
--branch o
p
tio
n
to s
p
l
i
t
c
o
mmand
.
commit
|
commitdiff
|
tree
2009-05-30
A
very Pennarun
t
yp
o
in c
o
mment
commit
|
commitdiff
|
tree
2009-05-24
Avery Penna
r
un
Mo
r
e to-d
o
i
tems based on feedback
commit
|
commitdiff
|
tree
2009-05-01
Av
e
ry Penn
a
r
un
Abort
i
f
-
-
rejoin fails
.
commit
|
commitdiff
|
tree
2009-04-26
Avery P
e
n
n
a
run
debug messag
e
s are off by defa
u
lt; use -d to enable
.
commit
|
commitdiff
|
tree
2009-04-26
Avery P
e
nnarun
test
.
sh: oops, neve
r
intended to count
t
h
e
raw number
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
A
very Pen
n
arun
Simplify merges e
v
en more ag
g
ressively
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennar
u
n
te
s
t
.
sh
:
m
ake su
r
e
no commit changes more than one
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
Only copy a commit if it has at least one no
n
id
e
n
t
ical
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
Trim some extr
a
merge c
o
m
m
it
s
th
a
t don't need t
o
go
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Aver
y
Pennarun
test
.
sh twe
a
k
commit
|
commitdiff
|
tree
2009-04-26
A
v
ery
P
ennarun
Add some basic ass
e
r
tions t
o
test
.
sh
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennaru
n
Add a 'cre
a
t
e
' helper function in test
.
sh
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
Clarify wh
y
we can'
t
do 'git rev-
l
is
t
' w
i
th a path
.
commit
|
commitdiff
|
tree
2009-04-26
Av
e
r
y
P
e
n
n
arun
Ty
p
o
w
h
e
n searching for existing splits
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
P
e
nnarun
Add --annotate
o
p
tion, and create recog
n
iza
b
le
file
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery P
e
nna
r
un
todo list
commit
|
commitdiff
|
tree
2009-04-25
Av
e
ry Pennar
u
n
C
h
ange
t
est
.
sh
to test the new add, merge, and
p
ull
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
A
very P
e
nnarun
H
a
ndl
e
it succes
s
fully
i
f a
g
ive
n
pare
n
t commi
t
h
a
s
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Add '
g
it subtr
e
e merge' and 'git subtree pull'
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennar
u
n
Add a
n
e
w 'git su
b
tree
add' command for ad
d
ing subtrees
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Aver
y
Pennarun
Pass the path u
s
ing the --prefix option inste
a
d
of
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Ave
r
y
P
ennarun
Okay, that was a
li
t
tl
e
t
oo
aggr
e
ssive
.
commit
|
commitdiff
|
tree
2009-04-25
Avery
P
e
n
nar
u
n
E
v
en more a
g
g
ressive commit trimming
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pen
n
arun
Pr
u
ne
out some e
x
t
r
a merge
c
om
m
i
t
s by com
p
aring their
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Av
e
r
y
P
ennarun
Qu
i
c
k test script for generating reasonably
complex
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Av
e
ry
P
en
n
arun
Skip over empty com
m
i
t
s
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Hmm
.
.
.
can
'
t
a
c
tually filter rev-list on
t
h
e
subdir
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery
Pennarun
Added a --onto option, but i
t
's so c
o
mplicated I
c
a
n
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Av
e
ry
Pe
n
narun
Use in
f
ormation about prior splits
to make sure merges
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
A
v
er
y
Pe
n
narun
Add a n
e
w
-
-
rejoin
o
ption
.
commit
|
commitdiff
|
tree
2009-04-24
Ave
r
y
P
e
n
n
a
run
Print out the n
e
wly created commitid
a
t
the end, for
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
A
ver
y
P
ennarun
We now copy the other st
u
ff ab
o
u
t
a commit
(
changelog
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
A
v
e
r
y
P
ennar
u
n
'
g
i
t subtree split' now
basica
l
ly w
o
rks
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennaru
n
b
a
sic
options parsing and wh
a
tn
o
t
.
commit
|
commitdiff
|
tree