repo.or.cz
/
git.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-1.6.2' into maint-1.6.3
2009-06-18
C
l
emens Buchacher
fetch: do not creat
e
r
e
f
from em
p
ty name
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Cle
m
ens Buchach
e
r
refuse to merge d
u
ring a
m
erg
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-28
Clemens Bu
c
hacher
fix
segf
a
u
l
t showing
a
n empty remote
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens
Bucha
c
her
s
impl
i
fy output
o
f conf
l
icting
m
erge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Cleme
n
s Bucha
c
he
r
u
pdat
e
cache for confli
c
ting submodul
e
e
ntries
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchache
r
a
dd tests for merging
with submodu
l
es
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
C
l
emens Bucha
c
her
remove pa
t
hspec_matc
h
,
use matc
h
_
p
athspec instead
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buc
h
a
c
her
clea
n
up pathspec ma
t
ching
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchacher
u
npack-tre
e
s: remo
v
e redunda
n
t path
s
ear
c
h in verify_absent
commit
|
commitdiff
|
tree
2009-01-05
Clem
e
ns B
u
chacher
unpa
c
k-trees
:
fix p
a
th search bug i
n
verify
_
a
b
se
n
t
commit
|
commitdiff
|
tree
2009-01-05
C
lemen
s
Buchac
h
er
unpack-trees: handle fai
l
u
r
e in v
e
rify_ab
s
ent
commit
|
commitdiff
|
tree
2008-12-15
C
l
em
e
ns Buch
a
c
h
e
r
m
o
dify/delete co
n
flict resol
u
tion o
v
erwrites unt
r
acked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemen
s
Buchac
h
er
push: fix
local refs upd
a
t
e
if already up-to-date
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
C
l
emens Buch
a
cher
do not force
write of p
a
cked
r
ef
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
C
lemens B
u
chacher
clone: fix creation of explicitl
y
name
d
t
a
rget directory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Clemen
s
Buc
h
ache
r
g
i
t gui
:
show diffs wi
t
h a minimum o
f
1
c
ontext line
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens B
u
chacher
http-push: remo
v
e remote lock
s
on exit sign
a
ls
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens Buchac
h
er
Reset the signal being handled
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
Cle
m
ens Buc
h
a
c
h
e
r
merg
e
-recursive: han
d
le file mode
c
hanges
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buchac
h
er
htt
p
-push: ad
d
regr
e
ssion tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clem
e
ns Buchacher
http-
p
u
sh
:
p
ush
<remote> :<br
a
nch
>
deletes remote
b
r
a
nch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree