repo.or.cz
/
git
/
haiku.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
B
u
c
hacher
simplify output of
c
onflicting
m
erge
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-04-05
Cleme
n
s
Buchacher
upda
t
e
c
ache for conf
l
icting
s
ubmodule entries
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-04-05
Clemen
s
Buch
a
cher
add tests
f
or m
e
rg
i
n
g wi
t
h
subm
o
d
u
l
es
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-01-15
C
lemens Buchacher
remove pat
h
s
pe
c
_ma
t
ch, use match_pathspec instead
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-01-15
C
l
e
mens Buchacher
clean up pathspec mat
c
hi
n
g
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-01-05
Clemen
s
Buch
a
cher
unpack-trees: r
e
move redundant
p
ath search
i
n
v
e
ri
f
y_ab
s
e
nt
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchacher
unpac
k
-t
r
ees:
fix path s
e
a
r
ch bug in verify_a
b
sent
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchache
r
unp
a
ck-tre
e
s: handle failure in ver
i
fy_abse
n
t
commit
|
commitdiff
|
tree
2008-12-15
Cle
m
ens Buchacher
mod
i
fy/de
l
ete conflict resolution overwrite
s
u
n
t
r
acke
d
.
.
.
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-11-05
Cle
m
ens Buchacher
p
u
sh: fix local ref
s
update
i
f al
r
ead
y
u
p
-to
-
d
a
t
e
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-11-05
Cleme
n
s
B
uchache
r
do not
f
o
r
ce write
o
f packed refs
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-09-03
C
l
emens Buchacher
clone: fix creatio
n
of explicitly named tar
g
et directory
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-09-01
Clemens Bu
c
hac
h
er
git gui: s
h
ow dif
f
s wi
t
h a minim
u
m of 1
co
n
te
x
t
line
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-05-25
Clemens B
u
chacher
http-
p
ush: remov
e
remot
e
locks on
e
xit s
i
gnals
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-05-25
Cleme
n
s Buchacher
Reset the signal bei
n
g h
a
ndled
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-03-14
C
l
emens
B
uchacher
merge
-
recursi
v
e: ha
n
dle fil
e
mode
changes
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-02-27
Cle
m
en
s
Buchacher
http-push
:
add regression test
s
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-02-27
Cl
e
mens Buchach
e
r
ht
t
p-push: push <remote>
:<branch> deletes r
e
mo
t
e
b
ranch
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree