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
Merge branch 'maint'
2008-07-25
Olivier Marin
update test case
t
o p
r
otect am --skip behaviour
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
git am
--skip:
clean
the index
w
h
ile prese
r
v
ing local
.
.
.
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-22
Olivier M
a
rin
parse-opti
o
ns
:
fix segmentati
o
n fault whe
n
a re
q
uire
d
.
.
.
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-22
Oli
v
ier Marin
g
it-am: remove dash from help message
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-19
Olivier Marin
builtin-rm: fi
x
index lock
f
ile p
a
th
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-07-10
Olivier M
a
rin
builtin-rerere: more carefully
f
ind conflict marker
s
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Marin
show
_
stats(
)
: fix stats width calculation
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-29
Olivi
e
r
M
arin
Documenta
t
ion: r
e
move {show,whatchanged}
.
difftree config
.
.
.
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-17
Oli
v
ier Mari
n
Fi
x
approxidate(
"
never") to always return 0
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-11
Ol
i
vie
r
Ma
r
i
n
remote show: li
s
t tracked remote b
r
anc
h
es with -n
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-11
O
l
ivi
e
r M
a
rin
remote prune: print the list of p
r
uned branc
h
es
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-11
Oliv
i
er Marin
builti
n
-
r
emot
e
:
split s
h
ow_or_prune() in two separat
e
.
.
.
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree
2008-06-11
Ol
i
vier Marin
r
emot
e
sh
o
w: fix t
h
e -n option
Signed-off-by:
Olivier Marin
<dkr@freesurf.fr>
commit
|
commitdiff
|
tree