repo.or.cz
/
git
/
git-bigfiles.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a second testcase for handling invalid strategies in git-merge
2008-07-29
O
li
v
ier Marin
builtin-
v
erify-tag: fix
-v
o
ption parsing
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-25
Oliv
i
er
Mari
n
update
t
est c
a
se to
p
rote
c
t
am --
s
kip be
h
avio
u
r
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Ma
r
i
n
git am --skip: clean th
e
i
n
dex while
pr
e
serving
loc
a
l
.
.
.
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-22
O
l
ivie
r
Marin
p
arse-opti
o
ns: f
i
x segmentation fault when a re
q
uired
.
.
.
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
git-a
m
: remove d
a
sh fr
o
m
hel
p
message
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-19
Olivi
e
r M
a
r
in
builtin-rm: fix i
n
dex lo
c
k file pat
h
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-10
O
livi
e
r Marin
builtin-rerer
e
: more carefu
l
ly
f
ind co
n
fl
i
c
t markers
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-29
Olivier M
a
rin
sho
w
_stats():
f
ix stats wid
t
h
calcula
t
io
n
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-29
Olivi
e
r
Ma
r
in
Do
c
umentation: remove {s
h
ow
,
whatcha
n
ged}
.
d
i
fftree co
n
f
ig
.
.
.
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-17
Olivier Marin
Fix
approxidate("
n
e
v
er") to always
r
eturn 0
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-11
Olivier Marin
remote show:
list tr
a
cked r
e
mote br
a
nches wit
h
-
n
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-11
O
livier Marin
remo
t
e prune: pr
i
nt
the list of pruned bran
c
hes
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-11
Oliv
i
er Marin
builtin-remote:
split
s
how_or_pru
n
e(
)
in two sepa
r
ate
.
.
.
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-11
Olivie
r
Marin
r
emote show: f
i
x the -n op
t
i
on
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree