repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
2009-04-05
Clemens Buchacher
simplify output of confl
i
cting merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clem
e
n
s
B
uchacher
upda
t
e cache for con
f
licting submodule ent
r
i
es
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchach
e
r
add
t
ests for
m
erg
i
ng with submo
d
ules
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clem
e
ns Buchacher
remove pa
t
hspe
c
_match,
u
se matc
h
_pathspe
c
ins
t
ead
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens
B
u
chacher
c
l
ean up
p
athspec mat
c
hing
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchacher
unpack
-
trees: remove redundant pa
t
h
s
earch in verify_
a
bsent
commit
|
commitdiff
|
tree
2009-01-05
Cl
e
men
s
Buchacher
unpack-trees: f
i
x pat
h
s
e
arch bug in ver
i
fy
_
absent
commit
|
commitdiff
|
tree
2009-01-05
Clemens
Buchacher
unpack-trees:
handle fai
l
ure in verify_a
b
s
e
nt
commit
|
commitdiff
|
tree
2008-12-15
Cl
e
mens Buchacher
mod
i
fy/delet
e
c
onflict
r
eso
l
uti
o
n overwrit
e
s
u
ntracked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buc
h
ache
r
push: fix local
r
efs
u
p
date if a
l
rea
d
y
u
p-to
-
date
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buch
a
cher
do not fo
r
ce w
r
ite of p
a
cked
refs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
Clem
e
ns
Buchache
r
clone: fix c
r
eation of explic
i
tl
y
named target di
r
ectory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Clemen
s
B
uc
h
a
cher
git
g
u
i
: show diffs w
i
th a minimu
m
of 1 context lin
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens
B
uchac
h
er
htt
p
-push: re
m
ov
e
remot
e
l
o
cks on
exi
t
signals
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
C
l
emens
B
uchacher
Reset
t
he signal
being han
d
led
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
Cle
m
ens Buchacher
merge-recursive: hand
l
e file mod
e
changes
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Cl
e
mens Buchacher
htt
p
-push: add regress
i
on
t
ests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemen
s
Bucha
c
h
e
r
http-pus
h
:
p
ush
<remote> :<br
a
nc
h
>
del
e
tes r
e
mo
t
e bran
c
h
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree