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
Clemens B
u
chacher
refu
s
e to merge during a me
r
g
e
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-05-28
C
lemens Buchach
e
r
fix segfault showing an
empty remo
t
e
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-04-05
C
leme
n
s Buchacher
simplify
o
utput of conflict
i
ng mer
g
e
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens
B
u
c
ha
c
he
r
update cache
for
conflicting submodule en
t
ries
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchach
e
r
a
dd tests for
m
e
r
ging
w
i
th submodules
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buchac
h
er
remove pathspec
_
m
a
t
ch, us
e
match_pathspe
c
ins
t
ead
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-01-15
Cle
m
ens Buchacher
clea
n
up pa
t
h
spec matchi
n
g
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-01-05
Clem
e
ns
B
uch
a
cher
unpack-trees: r
e
mo
v
e
red
u
n
dant path
search
in
v
erif
y
_absent
commit
|
commitdiff
|
tree
2009-01-05
C
lemens Buchacher
unpack-
t
rees:
fix
p
ath search bug in
ver
i
fy_
a
bsent
commit
|
commitdiff
|
tree
2009-01-05
Cle
m
en
s
Buchac
h
er
u
npack-trees: h
a
ndle failure in verify_abse
n
t
commit
|
commitdiff
|
tree
2008-12-15
Clemens B
u
chacher
modify/d
e
lete c
o
nflict r
e
sol
u
tio
n
ov
e
rwri
t
es untracked
.
.
.
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-11-05
Clemens
B
uchacher
push: f
i
x l
o
c
a
l re
f
s
update i
f
alre
a
dy up-to-date
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-11-05
C
l
emens Bu
c
hacher
do
n
ot force write of packed re
f
s
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-09-03
Cleme
n
s
Buchacher
clone: fix
c
rea
t
ion
o
f
explicitly named target di
r
ec
t
ory
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-09-01
Cl
e
m
e
ns Buchacher
git gui: show
diffs with a minimum of 1 context line
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-05-25
Clemens Buchacher
h
ttp-push: remove re
m
ote locks on exit s
i
g
nals
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-05-25
C
le
m
ens Buchach
e
r
Reset the
s
ignal being ha
n
d
l
ed
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-03-14
C
l
emens Bucha
c
h
e
r
merge-recursive: handle file m
o
de
c
hanges
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Bu
c
h
a
cher
htt
p
-p
u
s
h: add reg
r
e
ssi
o
n tests
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buchacher
ht
t
p-push: push <re
m
ote> :<br
a
nch> deletes remote branch
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree