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
git-apply: allow operating in sparsely populated working tree.
2005-10-03
F
r
edr
i
k
Kui
v
inen
[PA
T
CH] En
a
ble and fix su
p
port
for base
l
ess m
e
r
g
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[
P
A
T
C
H
]
T
e
a
c
h
git-ls-files a
b
out '--' to denot
e
e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
ed
r
i
k
Kui
v
inen
[PATCH] Teac
h
the
r
ec
u
rsive me
r
ge
strategy abo
u
t ren
a
me
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PA
T
CH] More descr
i
ptiv
e
me
s
sages for
c
onflict cas
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PA
T
CH] recursive-merg
e
:
D
on't pr
i
nt a
stack
trac
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
TCH] Us
e
t
h
e
'
die' function
w
h
e
re it i
s
a
p
pr
o
p
riate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
ine
n
[P
A
TCH] Use a
temporary index file whe
n
we
merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edr
i
k Kui
v
inen
[P
A
TCH] Ad
j
ust git-merg
e
-recursive
.
p
y f
o
r the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
rik Kuivi
n
en
[PATCH] Don't ou
t
put 'Automati
c
me
r
ge fail
e
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[PATCH] Be m
o
re like the 'resol
v
e' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATC
H
] Rename the 'fredrik' merge strategy to
'
r
e
cursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[PATCH] Make the Prog
r
amError class p
r
intab
l
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
M
ake
s
ure
w
e d
i
e if w
e
do
n
't get enough arg
u
ments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
nen
[PATCH] Intro
d
uce a
'
die' fun
c
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATC
H
] Exit with s
t
atus code 2 if we
get an
exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kui
v
inen
[PATCH] Fix assertion failure
w
hen merging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fre
d
r
ik
K
uivin
e
n
[
PA
T
CH] Make git-app
l
y underst
a
nd incomple
t
e lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree