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
Make --squash work with the 'add' command too.
2009-05-30
Avery P
e
nnarun
Ma
k
e --squash wor
k
with
t
he '
a
dd
'
command too
.
commit
|
commitdiff
|
tree
2009-05-30
Av
e
ry Pennarun
Fi
x
s
plitting
a
f
ter using
a
squash m
e
rg
e
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
Don't squa
s
h-m
e
rg
e
if the
old
a
nd
new commits
ar
e
the
.
.
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennaru
n
Bas
i
c "subtree
m
erge
--squash" supp
o
rt
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
merge_m
s
g() is
r
eally more
l
ike rejoin_msg()
.
commit
|
commitdiff
|
tree
2009-05-30
A
v
e
r
y Pennarun
FIXME help fo
r
--squash option
commit
|
commitdiff
|
tree
2009-05-30
Aver
y
Pennarun
slightly
re
a
rrange help message for split
.
commit
|
commitdiff
|
tree
2009-05-30
Avery Pennarun
N
ew
-
-
b
r
anch option to
split command
.
commit
|
commitdiff
|
tree
2009-05-30
Avery
Pennarun
typo in
c
o
m
ment
commit
|
commitdiff
|
tree
2009-05-24
A
ve
r
y Pe
n
narun
More to-d
o
items bas
e
d on fee
d
ba
c
k
commit
|
commitdiff
|
tree
2009-05-01
Avery Pennarun
Abort if --r
e
join fai
l
s
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennaru
n
debug message
s
are of
f
by default; use -d to en
a
ble
.
commit
|
commitdiff
|
tree
2009-04-26
Aver
y
P
enna
r
un
t
e
st
.
sh: oops, never intend
e
d
to c
o
u
n
t
t
he
raw number
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
A
very Pennar
u
n
Sim
p
lif
y
merges even m
o
re
a
g
gressively
.
commit
|
commitdiff
|
tree
2009-04-26
Avery
Pennarun
tes
t
.
s
h
:
m
ake sure no commit cha
n
ges more than one
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Aver
y
Pen
n
arun
Only cop
y
a co
m
mit if it has at least
o
n
e
nonidentical
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pennarun
T
r
im
some extra merge
comm
i
ts tha
t
do
n
'
t
n
e
e
d
t
o go
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
A
v
er
y
Pennar
u
n
t
e
st
.
sh tweak
commit
|
commitdiff
|
tree
2009-04-26
A
v
ery
P
ennarun
Add some basic assertions to test
.
sh
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Penna
r
u
n
A
dd
a 'crea
t
e'
h
elper function in test
.
sh
.
commit
|
commitdiff
|
tree
2009-04-26
Av
e
ry Penn
a
run
Cla
r
ify why w
e
can't do 'git r
e
v
-list' with a
path
.
commit
|
commitdiff
|
tree
2009-04-26
A
v
ery Pen
n
arun
Typo when
s
earchin
g
for exis
t
i
ng splits
.
commit
|
commitdiff
|
tree
2009-04-26
Av
e
ry Pen
n
arun
Ad
d
--an
n
otate opti
o
n, and create rec
o
gnizabl
e
file
.
.
.
commit
|
commitdiff
|
tree
2009-04-26
Avery Pe
n
n
arun
todo list
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennar
u
n
Change test
.
sh to test
t
h
e new ad
d
, m
e
rge, and pull
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Ave
r
y Pennarun
Ha
n
dl
e
it successfully if a
g
ive
n
parent commit has
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Add 'gi
t
su
b
tree
m
erge
'
and 'git
su
b
tree pu
l
l'
.
commit
|
commitdiff
|
tree
2009-04-25
A
very Pe
n
naru
n
Add a
new 'g
i
t subtree ad
d
' command for adding subt
r
ees
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Penn
a
run
Pass the pa
t
h u
s
ing th
e
--pre
f
ix opt
i
on instead o
f
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
O
k
ay, that was a lit
t
le
t
o
o
aggressive
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennaru
n
Even mo
r
e ag
g
r
essive com
m
it
trimming
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Prune out so
m
e extra mer
g
e commits by com
p
aring th
e
i
r
.
.
.
commit
|
commitdiff
|
tree
2009-04-25
Avery Pennarun
Q
uick t
e
st scr
i
p
t
for generati
n
g reasona
b
ly complex
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Av
e
ry Pennar
u
n
S
kip
over empty commits
.
commit
|
commitdiff
|
tree
2009-04-24
A
very Pennarun
H
mm
.
.
.
can
'
t actually filter r
e
v-list on the subdir
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Av
e
ry P
e
nn
a
run
Added a --onto option, bu
t
it's s
o
comp
l
icated I c
a
n
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Us
e
informat
i
on a
b
o
ut prior spl
i
ts to make sure merge
s
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
Avery
P
ennarun
Add a new --rejoin opti
o
n
.
commit
|
commitdiff
|
tree
2009-04-24
Avery Pennarun
Print out the n
e
wl
y
c
reated commitid at the end, for
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
A
very Pen
n
arun
We now cop
y
the other stuff about
a
commi
t
(
changelog
.
.
.
commit
|
commitdiff
|
tree
2009-04-24
A
v
e
ry Pe
n
narun
'gi
t
subtree split' n
o
w basically works
.
commit
|
commitdiff
|
tree
2009-04-24
Avery
P
ennar
u
n
basic opti
o
ns pars
i
ng and whatnot
.
commit
|
commitdiff
|
tree