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
refuse to merge during a merge
2009-06-02
C
l
emens Buch
a
cher
re
f
use
t
o
merge
d
uring a merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-28
Cleme
n
s
B
u
chacher
fix segf
a
ult
showing
a
n empty remote
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
s
i
mpli
f
y outpu
t
o
f
c
o
nfli
c
ting
m
er
g
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Cl
e
me
n
s B
u
c
hache
r
up
d
ate cache fo
r
confl
i
cting submodule entries
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens B
u
chacher
add
t
e
st
s
for merging wit
h
submodules
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Cl
e
m
e
n
s B
u
chache
r
re
m
ov
e
pathsp
e
c_mat
c
h, use match_pathspec instea
d
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buchacher
clean
u
p pat
h
spec matchi
n
g
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buch
a
cher
unpack-trees:
r
emove redundant pat
h
search in v
e
r
i
fy_absent
commit
|
commitdiff
|
tree
2009-01-05
Clem
e
ns Bucha
c
h
e
r
u
n
pack-tre
e
s
: f
i
x path
search
bug in verify_abs
e
nt
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buc
h
acher
unpa
c
k-tr
e
es: ha
n
d
l
e f
a
ilure in ver
i
fy_absent
commit
|
commitdiff
|
tree
2008-12-15
Cleme
n
s Bu
c
hacher
m
o
dify/dele
t
e conflict re
s
olution overw
r
ites
u
ntracke
d
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Cleme
n
s
Buchacher
push:
fix local refs update if already up-to
-
d
a
te
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buchacher
do not force write
o
f packed refs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
C
lemen
s
Buchach
e
r
clone:
f
ix
crea
t
ion
of
e
xplicitl
y
name
d
target
direc
t
ory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Cleme
n
s Buch
a
cher
git gui:
s
how
d
i
ffs with
a
m
i
nimum o
f
1
context
l
ine
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
C
l
emens Buchacher
http-
p
ush:
remove remote locks on e
x
it signals
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemen
s
Buchache
r
Reset
t
he si
g
nal being handled
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
Clemens Bu
c
hacher
m
e
rge-recursive: handle file
mo
d
e
changes
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buchacher
http-push: add regression
tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Cle
m
e
ns Buc
h
ache
r
htt
p
-
p
u
s
h: push <remote> :<
b
ranch> deletes remote branch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree