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
commit: -F overrides -t
2009-04-05
Clemens B
u
cha
c
her
simplify output of conflicting me
r
ge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemen
s
Buchacher
u
pd
a
t
e cac
h
e
f
or conflictin
g
submo
d
ule en
t
r
i
es
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
C
lemens
Buchacher
add tests for merging
w
ith su
b
mo
d
ules
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buchacher
rem
o
ve pathspec_match,
u
s
e
match_paths
p
ec i
n
stead
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
C
l
e
mens Buchacher
c
lean
up pathspec ma
t
ching
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clemens
B
uchacher
unpack-trees: rem
o
ve re
d
undant path
sea
r
ch i
n
verify
_
a
b
sent
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buch
a
cher
u
n
pack-trees: fix
p
ath sear
c
h
bug
i
n veri
f
y_
a
b
s
ent
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buc
h
ac
h
er
u
n
pack-tre
e
s:
h
a
n
dle fa
i
l
ure in
v
erify_ab
s
ent
commit
|
commitdiff
|
tree
2008-12-15
Clemens
Buchache
r
mod
i
fy/delete conflict resolutio
n
overwrite
s
unt
r
acked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buc
h
ac
h
er
push: fix local r
e
fs update
i
f
already
u
p-to-date
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clem
e
ns Buchache
r
do not force w
r
ite
o
f packed refs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
Clemens Buchache
r
cl
o
ne: fix creation of explicitly n
a
med target directory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
C
lemens Buchacher
g
it gui: show diffs
with a minimum of 1 con
t
ext
l
ine
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens
Buchacher
htt
p
-
p
u
sh: remove rem
o
te locks on
e
x
it signals
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens B
u
chacher
Rese
t
t
h
e si
g
nal
being hand
l
ed
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
Clemen
s
Buchacher
me
r
g
e
-recursive: h
a
ndle file mode cha
n
g
es
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
C
l
e
m
e
n
s
B
uchacher
h
t
tp-push: add regression tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buc
h
a
c
her
http-push: push <remote> :<branch> deletes remote branch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree