repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
simplify output of conflicting merge
2009-04-05
Clemens Buch
a
cher
simplify out
p
ut of conflictin
g
merge
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens B
u
c
h
ache
r
upd
a
te ca
c
h
e
for conflicting submod
u
le entries
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-04-05
Clem
e
ns Bu
c
h
acher
add tests
f
o
r
mergi
n
g wit
h
submodules
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-01-15
Cleme
n
s Bucha
c
h
e
r
remove
p
athspec_match, use match_
p
athspec inst
e
ad
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buchacher
clea
n
up path
s
pec m
a
tching
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-01-05
C
lemens Buchache
r
unpack
-
tree
s
: re
m
ov
e
redundant path
search in verify_abs
e
nt
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buch
a
cher
unpac
k
-trees:
fix path search bug in verify_
a
bsent
commit
|
commitdiff
|
tree
2009-01-05
Cle
m
en
s
B
uchacher
unpack-tre
e
s: handle failur
e
i
n
verify_abs
e
nt
commit
|
commitdiff
|
tree
2008-12-15
Clemens Bucha
c
her
mo
d
i
fy/de
l
ete conflic
t
resolu
t
ion o
v
e
rw
r
i
tes untracke
d
.
.
.
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-11-05
Cleme
n
s Buchacher
pu
s
h: fix local refs up
d
ate i
f
already
u
p-
t
o-date
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Bucha
c
her
do not
for
c
e write of packed refs
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-09-03
Clemens B
u
chacher
clo
n
e: fix creat
i
on of ex
p
li
c
i
tly named t
a
rget director
y
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-09-01
Clemens
B
uchac
h
er
git gui:
sh
o
w dif
f
s
with a mini
m
u
m of
1 cont
e
xt
l
ine
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-05-25
Clemens
B
u
c
h
acher
http
-
p
u
sh:
r
e
move remote locks
on exit s
i
gnals
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-05-25
C
l
e
mens Buc
h
ac
h
er
Reset the signa
l
be
i
ng handled
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-03-14
Cl
e
mens Buc
h
acher
merge-
r
e
c
ursive:
h
andle file m
o
de c
h
anges
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buchac
h
er
htt
p
-push: add
r
egr
e
ssion tes
t
s
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-02-27
Cl
e
m
e
ns Buc
h
a
c
her
http-pus
h
: push <
r
e
m
ote> :<branc
h
>
del
e
tes remot
e
bra
n
ch
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree