repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7601: extend the 'merge picks up the best result' test
2008-07-22
Olivier M
a
rin
git a
m
--skip:
clean the index while
preser
v
ing l
o
c
a
l
.
.
.
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-22
O
l
iv
i
er Marin
par
s
e-options: f
i
x s
e
gmentation fault when
a
required
.
.
.
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-22
O
l
iv
i
e
r
Marin
gi
t
-am: remov
e
dash from
h
e
lp message
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-19
Olivier Marin
builtin-rm: fix
i
ndex lock f
i
le pat
h
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-10
O
l
ivier Marin
buil
t
in-rerere: more carefully find conflict markers
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Marin
show_stat
s
(
)
: fix stats width calculation
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Marin
Documentation: remove {show,whatcha
n
ged}
.
difftree config
.
.
.
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-17
Olivier
Marin
Fix approxi
d
at
e
("nev
e
r") to always
r
eturn 0
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-11
Olivier M
a
rin
rem
o
t
e
show:
list tracked remote branches with -n
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-11
O
livier Marin
rem
o
te pr
u
n
e
: print the list of
pruned branches
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-11
Olivier
M
arin
b
u
iltin-remote
:
split show_or_prune()
i
n tw
o
separate
.
.
.
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-11
Olivier
Ma
r
i
n
remote show: fix th
e
-n optio
n
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree