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
Avery Pennarun
Merge branch 'mast
e
r' of git://
g
ithu
b
.
com/v
o
xpelli
.
.
.
commit
|
commitdiff
|
tree
2009-10-02
Avery Pe
n
narun
Add a README that sa
y
s to emai
l
me inst
e
ad
o
f
us
i
ng
.
.
.
commit
|
commitdiff
|
tree
2009-08-26
Avery
P
ennarun
Fix
b
ehaviour if you have
a branch na
m
ed the
s
ame a
s
.
.
.
commit
|
commitdiff
|
tree
2009-08-26
Avery Pennar
u
n
I
m
prove patch t
o
use git --exec
-
p
a
th: add to PATH
i
nste
a
d
.
commit
|
commitdiff
|
tree
2009-08-20
kTln2
Add explicit pa
t
h of git installation by 'git --exec
.
.
.
commit
|
commitdiff
|
tree
2009-08-02
Avery
P
en
n
arun
todo: idea for
a
'gi
t
subtree grafts' command
commit
|
commitdiff
|
tree
2009-08-01
Av
e
ry Pe
n
narun
todo
commit
|
commitdiff
|
tree
2009-07-16
A
very Pennarun
todo^
commit
|
commitdiff
|
tree
2009-07-10
Aver
y
Pennarun
todo
commit
|
commitdiff
|
tree
2009-07-09
A
v
ery Pennarun
Doc
s
:
w
hen pus
h
ing to github, the repo path ne
e
ds to
.
.
.
commit
|
commitdiff
|
tree
2009-07-07
Avery Pennarun
todo
commit
|
commitdiff
|
tree
2009-07-02
Avery Pennar
u
n
S
o
me tod
o
i
t
ems
report
e
d by
p
mccurdy
commit
|
commitdiff
|
tree
2009-06-15
Avery Pennarun
u
p
date t
o
do
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
man page: add an EXAMPLES s
e
ction
.
commit
|
commitdiff
|
tree
2009-05-30
Av
e
ry Pe
n
narun
Add basic git-su
b
tree manp
a
ge
i
n
asciidoc format
.
commit
|
commitdiff
|
tree
2009-05-30
A
v
ery Pennarun
Make --squ
a
sh work wit
h
the 'add'
c
o
mmand t
o
o
.
commit
|
commitdiff
|
tree
2009-05-30
Aver
y
Pennarun
Fix spl
i
tting after using a squas
h
me
r
ge
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
D
on't squash-
m
erge if t
h
e old
a
n
d new commits
are
the
.
.
.
commit
|
commitdiff
|
tree
2009-05-30
Avery
Pennarun
Basic "subtree
merge
-
-sq
u
ash" support
.
commit
|
commitdiff
|
tree
2009-05-30
Aver
y
Pennar
u
n
m
erge_msg() i
s
re
a
lly
m
or
e
like rejoin_msg()
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pe
n
narun
FIXME help for --squash option
commit
|
commitdiff
|
tree
2009-05-30
A
v
e
ry P
e
nnaru
n
sl
i
ghtly rearran
g
e help message for spl
i
t
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Penn
a
run
New --branch o
p
tio
n
to split c
o
mma
n
d
.
commit
|
commitdiff
|
tree
2009-05-30
A
v
er
y
Pennarun
ty
p
o
in co
m
ment
commit
|
commitdiff
|
tree
2009-05-24
A
v
er
y
P
ennarun
M
ore to-do items bas
e
d
o
n feed
b
ack
commit
|
commitdiff
|
tree
2009-05-01
Avery P
e
nnaru
n
Abort if --r
e
join fails
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Penna
r
un
debug messages
a
re off b
y
default; use -d to
e
nable
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
P
ennarun
t
est
.
sh: oops, never
i
nt
e
nded
to c
o
u
nt the raw
n
u
mber
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
P
ennarun
Si
m
p
l
i
fy merges even mor
e
agg
r
essively
.
commit
|
commitdiff
|
tree
2009-04-26
A
very Pe
n
narun
test
.
sh: make sure no commit changes more
than
o
n
e
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
P
en
n
a
run
O
n
l
y copy a commi
t
if it
has at least one nonidentical
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
T
r
im some extra merge commi
t
s that don't nee
d
t
o go
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pe
n
narun
test
.
sh tweak
commit
|
commitdiff
|
tree
2009-04-26
A
very P
e
nnarun
Add so
m
e bas
i
c
a
ssertions to test
.
sh
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
A
dd a 'creat
e
'
helper func
t
ion in
test
.
sh
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
C
larify why
we c
a
n
'
t
do 'git
rev
-
li
s
t' with a p
a
t
h
.
commit
|
commitdiff
|
tree
2009-04-26
Aver
y
P
e
nnarun
Ty
p
o when searching for
existing spl
i
ts
.
commit
|
commitdiff
|
tree
2009-04-26
Avery P
e
nna
r
un
Add
-
-
annotat
e
opti
o
n, and create recogn
i
za
b
le file
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
t
o
do list
commit
|
commitdiff
|
tree
2009-04-25
Aver
y
Pennarun
Change te
s
t
.
sh to test th
e
n
ew add,
merge, and pull
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Av
e
ry Pennarun
Ha
n
dle it suc
c
e
s
sfu
l
ly if a given parent commit has
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Ave
r
y Pennarun
Add 'git sub
t
ree merge' and 'git sub
t
ree pull'
.
commit
|
commitdiff
|
tree
2009-04-25
Avery
P
ennarun
Ad
d
a
new 'git subtree add' comman
d
for adding subtrees
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
P
ass the pa
t
h using
the --pre
f
ix option instead of
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Ave
r
y
Pen
n
arun
O
k
ay, that w
a
s
a little too aggressive
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Even more
aggressi
v
e commit trimming
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Penna
r
un
Prune out
some extra merge commi
t
s by comparing their
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Quick test script
f
o
r gen
e
r
a
ting
reason
a
bly complex
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Skip ove
r
emp
t
y
c
ommits
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Hmm
.
.
.
c
a
n
'
t act
u
ally fi
l
ter rev-lis
t
on the su
b
dir
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Added a --onto
option, but it's so complicated I
can
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Penn
a
run
Use
informa
t
ion a
b
o
u
t pri
o
r s
p
lit
s
to make sure
m
e
r
ges
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Ave
r
y Pennarun
Add a new --
r
ejoin option
.
commit
|
commitdiff
|
tree
2009-04-24
Ave
r
y
Pennaru
n
Print o
u
t the newly creat
e
d commitid at t
h
e end, for
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Ave
r
y Pennarun
We now c
o
py the ot
h
er st
u
ff ab
o
ut a c
o
mmit (cha
n
gelog
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
'git
subtree sp
l
it' now
b
asica
l
l
y works
.
commit
|
commitdiff
|
tree
2009-04-24
A
v
ery Pennar
u
n
ba
s
i
c opt
i
ons parsing and whatnot
.
commit
|
commitdiff
|
tree