repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jn/update-contrib-example-merge'
2010-08-25
Elijah N
e
w
r
en
tree-
w
alk
:
Correc
t
bitrotted comm
e
nt about tree_entr
y
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
El
i
jah N
e
wren
m
erge-recursive: Avoid exc
e
ssive o
u
tput for and reproce
s
sing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elij
a
h Newren
merg
e
-re
c
ursi
v
e:
F
ix mu
l
tip
l
e file rename across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
E
l
i
jah Newr
e
n
t
6
0
3
1
: Ad
d
a test
c
ase
c
overing
m
ultiple r
e
names across
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elija
h
Newren
merge-recursive:
Fix typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
Mark te
s
ts that use symlin
k
s
a
s needin
g
SYMLINKS prerequis
i
te
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newre
n
pull --rebas
e
: Avoid
spurious conflic
t
s and reap
p
l
y
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Ne
w
ren
t5520-pull: Add testca
s
es showing sp
u
rious conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
E
l
ijah New
r
en
u
p
l
oad-pack:
I
mprove erro
r
message
when bad
r
e
f
r
e
q
uested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elija
h
New
r
en
fast-export: Add a --
f
ul
l
-tree option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
E
l
i
j
ah Newren
fast-
e
x
p
ort
:
Fix d
r
opping of files w
i
th --import-mar
k
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
fast-im
p
ort: Improve robustness when D
-
>F chang
e
s provided
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah N
e
wren
fast-ex
p
ort:
F
ix
output
or
d
er of D/F changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
me
r
ge_r
e
cursive: F
i
x rena
m
es across
p
aths below D/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elij
a
h N
e
w
r
e
n
merge-recursi
v
e: Fix D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
ij
a
h Ne
w
ren
Add additional tes
t
ca
s
e
s
for D/F confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fas
t
-exp
o
rt
:
Documen
t
t
he
fact
t
hat git
-
re
v
-list
arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newre
n
Add ne
w
fa
s
t-
e
xport testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah
N
ewre
n
f
a
st-e
x
port: Add a --tag-of-f
i
ltere
d
-
object opt
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
i
jah Ne
w
ren
fast-export
:
D
o parent rew
r
iting to avoid dr
o
p
p
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h
Ne
w
re
n
fas
t
-export:
Make su
r
e w
e
sho
w
actual ref names instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah
Newren
fast
-
export:
Om
i
t
tags that tag trees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h Newren
fast
-
export: Set revs
.
t
o
po_order before ca
l
ling
s
etup_revis
i
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
E
lijah Newren
gitk: Make more opti
o
ns easi
l
y acce
s
sible f
r
om
Edit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elija
h
Newren
fast-ex
p
or
t
: Avoid
dropp
i
ng file
s
fro
m
commi
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elij
a
h Newren
C
o
r
rect missing SP characters
i
n gram
m
ar c
o
mment at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
g
i
t
-filter-br
a
nch:
avoid collisions with variables
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
Elijah Newren
E
nsure prope
r
setup of
g
it_dir fo
r
git-
h
ash
-
obje
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elijah
N
ewren
fast-
e
xport: ensure we traverse comm
i
ts i
n
t
o
polo
g
ical
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree