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
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-03-30
Christian Coude
r
B
isec
t
: Improve
error me
s
sage in "bis
e
c
t_ne
x
t_che
c
k
"
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2007-03-27
C
hristian Couder
Bisec
t
: add checks at
t
he beginning of "git bise
c
t
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2007-03-26
Chr
i
stian Couder
Bisect:
Use
"
git-show-ref
-
-verify" when res
e
ting
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2007-03-24
Chri
s
tia
n
C
o
u
d
er
Docume
n
t
a
tion: bisec
t
: make a comment fit bet
t
er in
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2007-03-24
C
h
r
istian Couder
Doc
u
me
n
t
a
ti
o
n:
b
i
s
e
ct: add some tit
l
es to
s
o
me paragraph
s
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2007-03-24
C
h
r
istian Couder
D
o
cumentat
i
on:
bisect:
r
e
f
ormat more paragraphs
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2007-03-24
Christi
a
n Couder
D
o
cumentation: bisect: reword one paragr
a
ph
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2007-03-24
Chr
i
stian
Couder
Documentation: bisect: ref
o
rmat some
p
aragraphs
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2007-03-23
Christ
i
an Couder
B
isect:
implement "git bi
s
e
ct
run <cm
d
>
.
.
.
" to automatica
l
ly
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-10-27
Christian Couder
Documentati
o
n:
a
dd git in /e
t
c/services
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-10-27
C
h
ristian Coud
e
r
Documentatio
n
: add
u
p
l
oad
-
a
r
chive ser
v
i
c
e to git-d
a
emon
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-10-26
Chr
i
stian Couder
Rem
o
v
e
-
-
syslog in git
-
daemon
i
netd do
c
umenta
t
ion examples
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-10-14
Christian Coud
e
r
Fix tracing when
G
IT_
T
R
ACE is se
t
to an em
p
ty st
r
ing
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-10-02
Christian
C
o
uder
Do not
c
reate
t
a
g lea
d
ing director
i
es sin
c
e git update
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-10-01
Christi
a
n
C
ou
d
e
r
Check that a
tag exist
s
using show-r
e
f
instead of
l
o
oking
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-10-01
Christian C
o
uder
Us
e
git-
u
pdate-ref to delet
e
a tag instead of r
m
()ing
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-10-01
Christian Couder
Cle
a
n
up
"
gi
t
-branch
.
sh" and add
r
e
m
ove rec
u
r
s
ive
d
ir
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-10-01
Christi
a
n
C
ouder
Fix a remo
v
e_empty
_
dir
_
recursive
p
roblem
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-28
Christian
C
ouder
Unco
m
m
e
nt
t
est ca
s
e: gi
t
branch c/d sh
o
uld barf if
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-28
Christian Coud
e
r
Wh
e
n cre
a
ting
branch c
/
d check
that
branch c does not
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-28
Christian
C
o
uder
A
d
d
p
ack-refs and show-ref test cases
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-26
Christian Co
u
der
Remove empt
y
ref di
r
ector
i
es that
p
revent crea
t
ing
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-20
Christia
n
Coud
e
r
Fi
x
show-ref usage for --der
e
ference
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-20
Chri
s
t
ian Couder
Docume
n
t git
-
s
how-ref [
-
s|-
-
h
a
s
h] option
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-17
Chris
t
ian Couder
Use Linus' show ref in "
g
it-branch
.
sh"
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-17
C
hristian Cou
d
er
Add
[-s|--hash] o
p
tion to Linus' sh
o
w
-
ref
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-13
Christian Cou
d
er
Fix space
i
n strin
g
" false" pro
b
lem in "trace
.
c
"
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-11
Christian
Couder
F
i
x a memory leak in
"
connect
.
c
" and die if co
m
mand
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-11
Ch
r
istian
C
o
u
de
r
M
ove
a
d
d
_to_
s
t
r
ing to "quote
.
c" and ma
k
e
i
t exter
n
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-06
Ch
r
istian
Couder
F
i
x memory leak in
p
re
p
e
n
d_to_
p
ath (git
.
c
)
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-03
Christi
a
n C
o
uder
U
p
d
a
te GIT_TR
A
CE documentatio
n
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-09-02
Chr
i
st
i
a
n
Co
u
der
Trace int
o
a file or an open fd and
r
efactor tracing
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-08-31
C
hristian Cou
d
er
Trace
i
nto open
f
d
and refactor tracing code
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2006-06-04
Christi
a
n Coud
e
r
B
u
iltin gi
t
-rev-
p
arse
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree