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
Clemen
s
Buchach
e
r
s
implify ou
t
put of con
f
l
i
c
t
ing merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
C
l
emens Buchacher
u
p
dat
e
c
a
che for conflicting su
b
modul
e
e
ntries
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
add
t
e
sts for merging
w
ith sub
m
o
dules
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buc
h
a
c
her
remove paths
p
ec_m
a
tch, use match_p
a
t
hsp
e
c in
s
t
e
ad
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buchacher
c
l
e
a
n
up pathspec matching
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchache
r
unpack-
t
rees: rem
o
ve re
d
undant path s
e
arch in ver
i
fy_absent
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchac
h
er
un
p
ack-trees: fix
p
ath search
bug
i
n verify_absent
commit
|
commitdiff
|
tree
2009-01-05
Clemens B
u
chach
e
r
unpack-trees: ha
n
dl
e
failure in verify
_
absent
commit
|
commitdiff
|
tree
2008-12-15
Clemens Buchacher
modify/de
l
ete co
n
flict resolut
i
on overwrites untrack
e
d
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens
B
u
cha
c
her
push: fix local r
e
fs update if
a
lrea
d
y up-to-date
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Cl
e
mens Buchacher
do not forc
e
write of packed refs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
Clemens Buchac
h
e
r
clone: fix creati
o
n
of
explicit
l
y named target directo
r
y
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
C
l
e
m
ens B
u
chacher
git gu
i
:
s
how
diffs w
i
th a minim
u
m o
f
1 conte
x
t line
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
C
lemens Buchach
e
r
http-push: rem
o
ve remote locks on exit si
g
n
als
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens
Buchacher
Res
e
t
the signal
being ha
n
dl
e
d
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
Clemens Buc
h
acher
merge-recursive:
h
andle fil
e
mode changes
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens
B
u
c
hacher
http-push: ad
d
regres
s
ion tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buchacher
h
ttp-
p
ush:
push <re
m
ote> :<branch> dele
t
e
s
remote branch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree