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
Use resolve_ref() to implement read_ref().
2005-09-25
Fredrik K
u
ivinen
[PATCH] M
o
re
descriptive
messages for confli
c
t c
a
s
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivinen
[PATCH] re
c
ur
s
iv
e
-mer
g
e: Don't print
a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
red
r
ik Kuiv
i
ne
n
[PATCH] Us
e
the 'die'
function whe
r
e it is appropriat
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
K
u
i
v
inen
[P
A
TCH] Use a
tempora
r
y inde
x
file
w
hen
w
e
m
erge
t
h
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivi
n
en
[PATCH
]
Adj
u
s
t git-mer
g
e
-re
c
ursive
.
py for the ne
w
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Don'
t
output 'Automatic merg
e
failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
A
T
CH] Be more like
the '
r
eso
l
ve' strate
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[
P
ATCH] Rename the 'fred
r
i
k' merge s
t
ra
t
e
g
y to 'recu
r
sive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATCH] Make th
e
ProgramError
cl
a
ss print
a
ble
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik
Kuivi
n
en
[PAT
C
H
]
M
a
ke
sure we die if
we don't get en
o
ugh a
r
g
um
e
nts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
dri
k
Kuiv
i
n
en
[PATCH] Introduce
a
'
die'
f
unctio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATC
H
]
Exit w
i
th status c
o
de 2 if we get an
e
xception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redri
k
Kuivinen
[PATCH] Fix
assertion fail
u
re w
h
en merging common
ances
t
ors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivi
n
en
[PA
T
CH] Make git-appl
y
understand incomp
l
ete
l
ines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree