repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
refuse to merge during a merge
2009-06-02
C
l
e
me
n
s Bu
c
hacher
refu
s
e to merge during a
merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-28
Clemens Buchacher
fi
x
segfault showing an
e
mpty remo
t
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Cl
e
m
ens Buchacher
simplify
o
ut
p
ut of
c
o
n
flic
t
ing merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
update
cache for conflict
i
ng su
b
m
o
dule ent
r
ies
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Cleme
n
s Buchacher
add tes
t
s f
o
r
m
ergi
n
g with submodules
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Cleme
n
s Buchacher
re
m
o
ve pathspec_ma
t
ch,
use mat
c
h_
p
athspe
c
inste
a
d
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
C
l
emens Buchache
r
clean
u
p pat
h
spec matching
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clem
e
ns Buchacher
unpack-trees: remove redun
d
ant
p
a
th
search in
verify
_
absent
commit
|
commitdiff
|
tree
2009-01-05
Cle
m
ens
Buchacher
u
n
pack-
t
rees: fix path search bug in verify_absent
commit
|
commitdiff
|
tree
2009-01-05
Cle
m
en
s
Buchacher
u
npac
k
-trees: ha
n
dle fai
l
ure in ve
r
ify_absent
commit
|
commitdiff
|
tree
2008-12-15
Clemens Buchacher
modi
f
y/delet
e
conf
l
ict resolu
t
ion overwri
t
es untracke
d
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buchacher
push: fix local refs
u
p
d
ate
i
f
a
lread
y
up-to-
d
a
te
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Bucha
c
her
do no
t
forc
e
write of packed
r
efs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
Cl
e
mens Buchacher
clone
:
fix
c
re
a
tion of
e
x
p
licitly named t
a
rget director
y
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Cleme
n
s
Buchache
r
g
i
t
gu
i
: sho
w
diffs with
a
minimum of 1 conte
x
t line
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens
B
uchacher
ht
t
p
-push:
remove remote locks
on exit
s
i
gnals
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens B
u
chacher
Reset the
s
i
g
n
a
l being handled
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
Clemens Buchacher
merge-recu
r
sive: handle
file
m
ode changes
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clem
e
ns Buchac
h
er
htt
p
-push: a
d
d regress
i
on tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Cle
m
ens Buchac
h
er
http-p
u
sh: push <remote
>
:<br
a
nch> delete
s
r
e
m
ote
branch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree