repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
GIT 0.99.9l aka 1.0rc4
2005-12-03
Fre
d
rik Kuiv
i
nen
N
e
w te
s
t
c
ase: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
nen
New
t
est case:
m
erge with directory/
f
ile confl
i
c
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
test-lib
.
sh: Add ne
w
funct
i
on, tes
t
_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivinen
g
it
-
merge: E
x
it with code 2 if no str
a
tegy was a
b
le
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
Kuivinen
m
e
rge-recur
s
iv
e
:
R
eplac
e
'
except:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Ku
i
v
i
nen
me
r
ge-recu
r
sive: Use
'~' ins
t
ead of
'_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivin
e
n
m
e
rge-rec
u
rs
i
ve: A
d
d copyright noti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivine
n
merge-
r
ecursive: I
n
den
t
the output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik K
u
ivin
e
n
m
e
r
g
e-recursive: Fix support for branch name
s
co
n
tain
i
ng
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
Kuiv
i
nen
merge-recursive
:
Fix limited out
p
ut of re
n
ame m
e
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivine
n
m
erge-recursive:
O
n
l
y
print relevant r
e
na
m
e messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fr
e
drik
K
uivinen
[P
A
TCH
]
Enable a
n
d
f
ix supp
o
rt
f
o
r
base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik Kuiv
i
nen
[PAT
C
H
]
T
e
ach git-l
s
-fil
e
s a
b
out '--' to den
o
te end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
d
r
i
k Kuivinen
[PATCH] Tea
c
h the recursi
v
e merge strategy
a
bout re
n
ames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivi
n
en
[PATC
H
] Mo
r
e
d
e
scr
i
p
t
ive messages for conflict ca
s
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuiv
i
n
e
n
[PA
T
CH] re
c
ursive-merge: Don't print a stac
k
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
K
uivinen
[PATCH] Use
t
h
e
'die' function
wh
e
r
e i
t
is app
r
opriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[PATCH] Us
e
a
temp
o
rary index file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kui
v
inen
[PATCH] Adju
s
t git-merge-r
e
curs
i
ve
.
py for the ne
w
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PATCH
]
Don't outp
u
t 'Automat
i
c
me
r
g
e
fai
l
ed
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivin
e
n
[
P
A
TCH] Be
mo
r
e like
t
he 'reso
l
ve'
s
tra
t
e
gy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuiv
i
nen
[PA
T
CH] Rename th
e
'
f
redri
k
' merge strategy
to
'
r
ecursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[PA
T
CH]
Make the ProgramError class p
r
intable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[PA
T
CH] Make sure
w
e die if we don't get
e
nough argume
n
ts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Ku
i
v
i
n
en
[
P
ATCH] Intro
d
uce a 'die
'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kui
v
inen
[PATCH
]
Exit with status code
2
if
w
e get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivin
e
n
[PATCH] Fi
x
assertion fa
i
l
u
re whe
n
m
erging common
ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
r
edri
k
K
u
ivin
e
n
[
P
ATCH] Make git-apply understand inco
m
plete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree