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
Merge branch 'jk/show-upstream'
2009-04-05
Clemen
s
B
uch
a
cher
simplify
o
utput o
f
conflicting merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
C
l
emens
B
uchacher
update cache for conflicting submodule e
n
tries
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
add tests fo
r
merging w
i
th submodules
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clem
e
ns Buchacher
remove p
a
thspec_match, use
m
atc
h
_path
s
pe
c
inst
e
ad
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Bu
c
hacher
clean u
p
paths
p
e
c
matching
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Cleme
n
s Buchacher
u
n
p
ack-trees: remo
v
e redundant
p
ath search in verif
y
_a
b
s
ent
commit
|
commitdiff
|
tree
2009-01-05
Clemens
Bu
c
hacher
unpack-trees: fix path search bug
i
n verif
y
_absent
commit
|
commitdiff
|
tree
2009-01-05
Cl
e
mens Bu
c
hacher
unpac
k
-trees: handl
e
failur
e
in
v
erify_abse
n
t
commit
|
commitdiff
|
tree
2008-12-15
Clemens Buchacher
modify/delete conflict res
o
lution overwrites untracked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens
Buch
a
cher
push: fix lo
c
al refs up
d
ate
i
f alr
e
ady
up-to-date
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buchacher
d
o not force w
r
i
t
e of packed ref
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
Clem
e
ns Buchacher
clone: fix creation of explicitly
n
am
e
d target direct
o
ry
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Clemens Bucha
c
her
git g
u
i: show di
f
f
s with a minimum of 1 context lin
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens Buchacher
http-push: remov
e
remote locks on exit signal
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clem
e
ns
B
uchache
r
Reset the
s
ignal b
e
ing han
d
led
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
Cle
m
ens
B
uchache
r
me
r
ge-recurs
i
ve
:
handle f
i
le m
o
d
e
changes
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
C
lemens Buchacher
http-push: add regression test
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemen
s
Buchacher
http-p
u
sh: push <
r
emote> :<br
a
nch> deletes re
m
o
te branc
h
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree