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
Fix behaviour if you have a branch named the same as your --prefix
2009-08-26
Avery Pennarun
Fix
b
ehav
i
o
u
r if you have a branch name
d
t
he same a
s
.
.
.
commit
|
commitdiff
|
tree
2009-08-26
Avery Pennarun
Improve
p
atch to u
s
e gi
t
--exec-pat
h
:
a
dd to PAT
H
instead
.
commit
|
commitdiff
|
tree
2009-08-02
Avery Pennaru
n
t
o
d
o
:
ide
a
f
o
r
a
'git subtr
e
e
g
rafts
'
c
o
mman
d
commit
|
commitdiff
|
tree
2009-08-01
Avery Pennarun
todo
commit
|
commitdiff
|
tree
2009-07-16
Avery Penn
a
r
u
n
todo^
commit
|
commitdiff
|
tree
2009-07-10
Avery
P
ennaru
n
todo
commit
|
commitdiff
|
tree
2009-07-09
Avery
P
e
n
narun
Docs: when pus
h
ing to
g
ith
u
b, t
h
e repo pat
h
needs to
.
.
.
commit
|
commitdiff
|
tree
2009-07-07
Av
e
ry Pennarun
t
o
do
commit
|
commitdiff
|
tree
2009-07-02
A
v
e
ry Penna
r
un
So
m
e t
o
do i
t
em
s
reported
b
y pmc
c
urdy
commit
|
commitdiff
|
tree
2009-06-15
Ave
r
y
Pe
n
naru
n
updat
e
to
d
o
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
man page: add
a
n
EX
A
MPLES secti
o
n
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pe
n
narun
Add basi
c
git-subtree
ma
n
p
age in asciidoc form
a
t
.
commit
|
commitdiff
|
tree
2009-05-30
Avery P
e
nn
a
run
Make
-
-sq
u
ash work with
the 'add' command t
o
o
.
commit
|
commitdiff
|
tree
2009-05-30
Avery
P
ennarun
Fix splitting afte
r
u
s
ing a squash
mer
g
e
.
commit
|
commitdiff
|
tree
2009-05-30
Avery P
e
nnarun
Don't squash
-
merge if th
e
old and new co
m
mits ar
e
the
.
.
.
commit
|
commitdiff
|
tree
2009-05-30
Avery
Pe
n
narun
Basic "subtree
merge --squash" su
p
port
.
commit
|
commitdiff
|
tree
2009-05-30
Ave
r
y Pennarun
merge_msg() is really more like rejoin_
m
sg()
.
commit
|
commitdiff
|
tree
2009-05-30
Avery
P
ennarun
FIXME help for
-
-
squash opt
i
on
commit
|
commitdiff
|
tree
2009-05-30
A
v
ery Penna
r
un
sl
i
g
h
tly rea
r
range h
e
lp m
e
ss
a
ge
f
o
r
split
.
commit
|
commitdiff
|
tree
2009-05-30
A
very P
e
n
narun
New --branch op
t
i
o
n to split
c
o
m
mand
.
commit
|
commitdiff
|
tree
2009-05-30
A
v
ery Penn
a
run
t
ypo in comment
commit
|
commitdiff
|
tree
2009-05-24
Av
e
r
y Pennarun
More t
o
-do items
based on feedback
commit
|
commitdiff
|
tree
2009-05-01
Avery Pennar
u
n
Abort if --rejoin fails
.
commit
|
commitdiff
|
tree
2009-04-26
Ave
r
y Pe
n
n
a
run
debug messages are off by default; use
-
d to enable
.
commit
|
commitdiff
|
tree
2009-04-26
Avery P
e
nnarun
test
.
sh: oops, never i
n
tend
e
d to
c
ount the ra
w
n
umber
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
Simplify m
e
rges even more
aggres
s
ively
.
commit
|
commitdiff
|
tree
2009-04-26
Av
e
ry
P
ennarun
test
.
sh
:
make sure no
commit changes
more than one
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Av
e
r
y
Pen
n
ar
u
n
Only cop
y
a commit if it has at
least on
e
nonidentical
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
P
ennar
u
n
T
r
im some
ex
t
ra m
e
r
ge commit
s
that don't need to g
o
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennar
u
n
test
.
sh
tweak
commit
|
commitdiff
|
tree
2009-04-26
Aver
y
P
e
nnarun
Add som
e
basic assertio
n
s
t
o
test
.
sh
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
Add a 'create' helper funct
i
on in test
.
s
h
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
P
ennarun
Clarify why we
can't do '
g
it rev-list' with
a
path
.
commit
|
commitdiff
|
tree
2009-04-26
A
v
ery Pennarun
Ty
p
o when
searching for
e
xisting spl
i
ts
.
commit
|
commitdiff
|
tree
2009-04-26
A
very P
e
nnarun
Add --annot
a
te option, and create recognizabl
e
f
i
le
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pe
n
nar
u
n
todo list
commit
|
commitdiff
|
tree
2009-04-25
Av
e
ry Pennarun
Change test
.
sh to test the
new add,
merg
e
,
and pull
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Av
e
ry Pen
n
arun
Handle it succ
e
ssfully if a given
parent commit has
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery
P
ennarun
Add 'gi
t
s
u
b
t
r
e
e
merge' and
'
git subt
r
ee pull'
.
commit
|
commitdiff
|
tree
2009-04-25
Aver
y
Pennarun
Ad
d
a new 'git subtree
add'
command f
o
r
adding subtrees
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
A
very Pennarun
Pa
s
s
t
he path
using the --p
r
efix option instea
d
of
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery P
e
nnarun
O
k
a
y
, that was a lit
t
le
t
oo aggress
i
ve
.
commit
|
commitdiff
|
tree
2009-04-25
A
very
Pennar
u
n
Even more a
g
gressive
com
m
it
trimmi
n
g
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Prune out some extra merge commi
t
s b
y
co
m
p
a
ring the
i
r
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Av
e
r
y
Pennarun
Quick test s
c
ript for
g
eneratin
g
rea
s
onably complex
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Skip ove
r
empty commits
.
commit
|
commitdiff
|
tree
2009-04-24
Aver
y
Pe
n
na
r
u
n
Hmm
.
.
.
can't actually filter rev-list on the su
b
dir
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pen
n
arun
Added
a --onto option, but it's so co
m
plicated
I
can
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Ave
r
y Pen
n
arun
Use inform
a
ti
o
n about
p
rio
r
sp
l
its to make sure merges
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Ad
d
a
new -
-
rej
o
in
o
ption
.
commit
|
commitdiff
|
tree
2009-04-24
Ave
r
y Pennarun
Print
o
ut
the newly c
r
eat
e
d commitid a
t
t
he end, fo
r
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
We no
w
copy the other st
u
f
f about a commit (changelog
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Aver
y
Pennarun
'git subt
r
ee
split'
now basically
w
o
r
ks
.
commit
|
commitdiff
|
tree
2009-04-24
Aver
y
P
ennar
u
n
b
a
si
c
options parsi
n
g and w
h
atnot
.
commit
|
commitdiff
|
tree