repo.or.cz
/
git
/
gitweb.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 Buchacher
simplify
o
utp
u
t
o
f confl
i
cting merge
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buch
a
c
her
upd
a
t
e
c
ache
for
c
on
f
licting submodul
e
e
ntr
i
es
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens B
u
cha
c
her
a
d
d tests
for
merg
i
ng with su
b
modules
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Bu
c
hacher
rem
o
ve pa
t
hspec_match, use match_paths
p
ec instead
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buchacher
clean u
p
paths
p
ec matching
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2009-01-05
Clemen
s
Bu
c
hacher
unpack-
t
ree
s
:
remo
v
e redundant path search in veri
f
y_a
b
sent
commit
|
commitdiff
|
tree
2009-01-05
Cl
e
mens
Buchacher
unpack-tree
s
:
f
i
x
pat
h
s
earc
h
bug
i
n
verify_absent
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchacher
unpack-
t
rees:
h
andle
failure in verify_absent
commit
|
commitdiff
|
tree
2008-12-15
C
l
emens Buchacher
mo
d
ify/delete conf
l
i
ct re
s
olu
t
ion ov
e
rwrites untracked
.
.
.
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buchacher
push: fix
l
ocal refs u
p
d
a
t
e if
already up-to-date
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-11-05
Cle
m
e
n
s Bu
c
h
a
cher
do no
t
force write of p
a
cked re
f
s
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-09-03
C
l
em
e
ns Bu
c
h
acher
clone:
fix creation
o
f e
x
plicitly named target d
i
recto
r
y
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-09-01
Clemens Buchach
e
r
git gui: show diffs with a minimum
o
f
1
c
o
ntext
l
ine
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-05-25
Clemens Buchacher
http-push: rem
o
ve re
m
ote locks
on exit signals
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-05-25
Clemens Buchacher
R
e
set
t
h
e
signal being handled
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-03-14
C
l
e
m
e
ns
Buchach
e
r
merg
e
-recursive: handle file mode changes
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buchacher
http-push:
a
dd regression tests
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree
2008-02-27
Cle
m
ens Buchacher
h
t
t
p-push: pu
s
h <remote> :<branch>
d
eletes remote branch
Signed-off-by: Clemens Buchacher <
drizzd@aon.at
>
commit
|
commitdiff
|
tree