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
Merge branch 'master' of git://github.com/voxpelli/git-subtree
2009-10-02
A
very Pennarun
Merge branch
'master' of git://githu
b
.
com/vo
x
p
elli
.
.
.
commit
|
commitdiff
|
tree
2009-10-02
Avery Pennarun
Ad
d
a
README tha
t
says to email me
i
nstead of
u
s
i
ng
.
.
.
commit
|
commitdiff
|
tree
2009-08-26
Ave
r
y Pennarun
F
i
x behaviour if
you ha
v
e a bran
c
h named the
same a
s
.
.
.
commit
|
commitdiff
|
tree
2009-08-26
A
very Pennarun
Improve pa
t
ch to
use git --exec-path: add
to PATH in
s
t
ea
d
.
commit
|
commitdiff
|
tree
2009-08-20
kTln
2
Add expli
c
it pat
h
o
f
git
installa
t
ion by 'git --exec
.
.
.
commit
|
commitdiff
|
tree
2009-08-02
Avery Pennarun
todo: idea for a 'git subtree grafts'
command
commit
|
commitdiff
|
tree
2009-08-01
Avery Pennar
u
n
todo
commit
|
commitdiff
|
tree
2009-07-16
Avery P
e
n
n
arun
todo^
commit
|
commitdiff
|
tree
2009-07-10
A
very P
e
nnar
u
n
t
o
d
o
commit
|
commitdiff
|
tree
2009-07-09
Avery Pennarun
D
o
cs: w
h
en pushing to githu
b
,
the repo p
a
th
needs to
.
.
.
commit
|
commitdiff
|
tree
2009-07-07
Avery
P
e
nnarun
todo
commit
|
commitdiff
|
tree
2009-07-02
Avery P
e
nna
r
u
n
S
o
me todo items re
p
o
r
ted b
y
pmccurdy
commit
|
commitdiff
|
tree
2009-06-15
Avery
Pennar
u
n
up
d
ate tod
o
commit
|
commitdiff
|
tree
2009-05-30
A
v
e
ry Pen
n
arun
m
a
n page
:
add an EXAMPLES sec
t
ion
.
commit
|
commitdiff
|
tree
2009-05-30
Avery
Pennarun
A
dd b
a
sic git-subtree
m
anpage i
n
a
sciidoc format
.
commit
|
commitdiff
|
tree
2009-05-30
Aver
y
P
ennarun
Mak
e
-
-
squa
s
h
work
with th
e
'add
'
command
too
.
commit
|
commitdiff
|
tree
2009-05-30
Avery
P
e
nnarun
Fix s
p
litting a
f
t
e
r using a
squas
h
merge
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennar
u
n
Don'
t
squ
a
sh-
m
erge if the
old and new comm
i
t
s
are the
.
.
.
commit
|
commitdiff
|
tree
2009-05-30
A
very Pennaru
n
Basic "
s
ub
t
r
e
e me
r
ge --
s
quash" support
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pen
n
arun
merge_msg() is
r
eally more
l
i
ke
r
ejoin_msg
(
)
.
commit
|
commitdiff
|
tree
2009-05-30
Av
e
ry
Penn
a
run
FIXME h
e
lp for -
-
squash
o
ption
commit
|
commitdiff
|
tree
2009-05-30
Avery Pen
n
arun
sligh
t
ly rearrange help
m
essage for split
.
commit
|
commitdiff
|
tree
2009-05-30
A
ve
r
y Pen
n
arun
New --branch opt
i
on to
s
pl
i
t command
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
typ
o
in com
m
ent
commit
|
commitdiff
|
tree
2009-05-24
A
v
ery
Pennarun
M
o
r
e to-do items based
on feedback
commit
|
commitdiff
|
tree
2009-05-01
Avery P
e
nn
a
run
Abort
if -
-
rejoin fails
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
Pennaru
n
debug messages
ar
e
off
b
y
defa
u
lt; use -d to ena
b
l
e
.
commit
|
commitdiff
|
tree
2009-04-26
A
v
ery Pen
n
arun
t
e
st
.
sh: oops, never intended to count the raw number
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
P
en
n
aru
n
Simplify m
e
rg
e
s e
v
en more aggressively
.
commit
|
commitdiff
|
tree
2009-04-26
Aver
y
P
e
nnarun
test
.
sh: make sure no
commit changes more
than one
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
P
ennarun
On
l
y
c
opy a commit if it
h
as
a
t least o
n
e non
i
de
n
t
i
c
a
l
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Penn
a
run
T
r
im some extra m
e
rg
e
commits that d
o
n't need to go
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
t
e
st
.
sh
t
weak
commit
|
commitdiff
|
tree
2009-04-26
A
v
ery
P
en
n
a
r
u
n
Add some basic ass
e
rtions to test
.
sh
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Penna
r
un
A
d
d a
'
create' helper
f
u
ncti
o
n in test
.
sh
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Penn
a
run
Clari
f
y why we can't do 'git rev-list' with a
pat
h
.
commit
|
commitdiff
|
tree
2009-04-26
Ave
r
y Pennarun
Typo when s
e
arc
h
ing for e
x
i
s
t
ing splits
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
Pennaru
n
Add -
-
annotate option, and c
r
eate recogn
i
zable file
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
Pennarun
todo
l
ist
commit
|
commitdiff
|
tree
2009-04-25
Avery Pe
n
narun
Chang
e
test
.
sh to test the new add,
merge,
a
nd pull
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
A
very P
e
nnar
u
n
Hand
l
e it succ
e
ssfully
if a gi
v
en pa
r
e
n
t commit has
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery
P
enn
a
run
A
d
d
'git subtree me
r
g
e
' and 'git subtre
e
p
u
ll'
.
commit
|
commitdiff
|
tree
2009-04-25
Ave
r
y Pen
n
arun
Add a n
e
w 'git
subt
r
ee add' command for adding subtrees
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Pass the path
us
i
ng the --prefix option ins
t
ead
o
f
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery P
e
nnarun
Okay, that wa
s
a
little too aggressive
.
commit
|
commitdiff
|
tree
2009-04-25
Av
e
ry Pennar
u
n
Even mo
r
e aggressiv
e
c
ommit t
r
i
mming
.
commit
|
commitdiff
|
tree
2009-04-25
Av
e
ry Pennarun
Prune out som
e
ex
t
r
a m
e
rge c
o
mmits by comparing t
h
ei
r
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Quick test
s
c
ript for gene
r
atin
g
reasonably com
p
lex
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery
P
ennaru
n
Skip
o
v
e
r empty commits
.
commit
|
commitdiff
|
tree
2009-04-24
Av
e
ry Penn
a
run
H
m
m
.
.
.
can't ac
t
ua
l
ly
f
ilter rev-l
i
st on the subdir
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
A
v
ery
P
en
n
arun
Add
e
d a --onto opt
i
on, b
u
t it's
so c
o
mplicated
I
c
a
n
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennar
u
n
U
s
e i
n
formatio
n
abo
u
t
prior splits to m
a
ke s
u
re
m
erges
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Av
e
ry Pe
n
narun
Add
a
new --
r
ejoin
o
ptio
n
.
commit
|
commitdiff
|
tree
2009-04-24
Aver
y
P
e
nnarun
Print
o
ut t
h
e newly created
commit
i
d at
the end, for
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pen
n
arun
We now copy the
o
t
her stuff a
b
o
ut
a
c
ommit (change
l
og
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
'git subtree sp
l
i
t
'
n
ow basic
a
l
ly works
.
commit
|
commitdiff
|
tree
2009-04-24
Avery
P
en
n
arun
b
a
sic op
t
ion
s
pa
r
sing and whatnot
.
commit
|
commitdiff
|
tree