repo.or.cz
/
git
/
vmiklos.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
Clemens Buchacher
fetch: do n
o
t crea
t
e ref fro
m
empt
y
na
m
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clemens Bu
c
hach
e
r
refuse
to merge durin
g
a
merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-28
Clemens Buchacher
fix segfau
l
t sho
w
in
g
an
empty remote
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens B
u
chacher
s
im
p
lify output o
f
conflictin
g
me
r
g
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchac
h
er
update cache for conflicting submodule en
t
r
i
es
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Cleme
n
s Buchacher
add
t
e
s
ts for
m
erging
w
it
h
submodules
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Cle
m
e
n
s
Buch
a
c
her
re
m
o
ve pathspec_m
a
tch
,
use match
_
paths
p
ec instead
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buchacher
clean up path
s
pec
m
atching
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clemen
s
Buchacher
u
npack-trees: remov
e
r
e
dundant path se
a
rch in
verify
_
absen
t
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchacher
unpa
c
k-tr
e
es: fix path
search bug in ver
i
f
y
_ab
s
ent
commit
|
commitdiff
|
tree
2009-01-05
Cl
e
m
e
ns Buchache
r
unpa
c
k-trees: handle failure in ve
r
ify_a
b
sent
commit
|
commitdiff
|
tree
2008-12-15
Cle
m
ens Buchacher
modify/delete conf
l
ict resolution overwrite
s
un
t
rac
k
ed
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Cle
m
e
ns Bucha
c
h
er
push: fix local refs update if alr
e
a
d
y up-to-date
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemen
s
Bucha
c
her
do not force
w
ri
t
e
of pac
k
ed refs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
C
l
e
mens Buchacher
clone: fi
x
creation of explicitly named
t
arget directory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Cl
e
mens
B
uchac
h
er
git gui: s
h
ow diffs with
a minimum of 1
c
o
ntext line
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Cl
e
mens Buchacher
http-pu
s
h:
r
emove remote locks on exit
s
ignals
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clem
e
ns
B
uchacher
Re
s
et the signal
b
e
in
g
handled
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
Clemen
s
Buchacher
merge-recursive
:
handle
f
ile mode change
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
C
l
e
mens
Buchach
e
r
http-pu
s
h: add regressio
n
tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
C
l
emens Buchacher
h
ttp-push:
p
u
sh
<
remote> :<br
a
nch> deletes
r
emote
branch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree