repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint
2009-04-05
Cleme
n
s Buch
a
cher
simpli
f
y outp
u
t of conf
l
i
cting merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens B
u
chacher
upd
a
te ca
c
he
fo
r
conflict
i
ng
s
ubm
o
dule entries
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
C
l
eme
n
s
Buc
h
acher
add tests for merging
w
i
th subm
o
dule
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemen
s
Buchacher
r
emove pathspec_m
a
t
c
h, u
s
e m
a
tch_pathspe
c
instead
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buchacher
c
l
ea
n
up pat
h
spe
c
matching
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
C
l
e
m
ens
B
uchacher
unpack-trees: remove r
e
dunda
n
t path search in verify_absent
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchacher
unpack-trees: fi
x
pat
h
searc
h
bug in
v
erify_absent
commit
|
commitdiff
|
tree
2009-01-05
Clemens
B
uchach
e
r
unpack-tree
s
: hand
l
e failure in
v
er
i
fy_absent
commit
|
commitdiff
|
tree
2008-12-15
Clemens Buchacher
modify/dele
t
e con
f
lict resolution over
w
rites
u
ntrack
e
d
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
C
lemens B
u
chacher
pus
h
: fix
local
r
efs up
d
ate i
f
a
lre
a
dy up-to-date
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clem
e
n
s
B
uchacher
d
o
not force write of
p
ack
e
d refs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
Cle
m
ens Bucha
c
her
clone:
fix
c
reation of explicitly named target director
y
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Clemens Buchacher
git gui
:
s
ho
w
diffs with a
mini
m
um of 1 cont
e
xt
l
ine
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens
Buchach
e
r
http-push: rem
o
ve remot
e
locks
o
n
exit si
g
nals
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
C
leme
n
s Buch
a
cher
Res
e
t the signal be
i
ng hand
l
ed
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
Clemens Buchacher
m
erge-recursive: hand
l
e fil
e
mo
d
e c
h
anges
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buchacher
http-push:
add regression tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buchacher
http-
p
ush: push <re
m
ote> :<branch>
d
e
letes
re
m
o
t
e branch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree