repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Warn when send-pack does nothing
2005-12-03
Fredrik Kuivine
n
New
test c
a
se:
C
riss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuivinen
New test case: mer
g
e
w
ith di
r
ectory/file
conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik K
u
ivinen
test-lib
.
sh: Add
n
ew fu
n
ct
i
on, test_e
x
pect_cod
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivine
n
g
i
t-me
r
ge: Ex
i
t with code 2 if no strategy
w
a
s able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik K
u
ivine
n
merge-r
e
cursiv
e
: Replace '
e
x
cept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
i
vinen
m
erge-recursive: U
s
e '~
'
instea
d
of '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
ivinen
merge-
r
ecursive: Add copyr
i
ght
notic
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
redrik Kui
v
inen
merge-re
c
ursive: I
n
dent the o
u
tput
properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik Kui
v
inen
m
e
r
g
e-recu
r
sive: Fix sup
p
ort for branch nam
e
s co
n
taining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
ed
r
i
k
Kuiv
i
ne
n
mer
g
e-recursive
:
F
i
x limite
d
out
p
ut
of r
e
name messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fred
r
ik
Ku
i
vinen
m
e
rge
-
recurs
i
ve:
Onl
y
pr
i
nt rele
v
ant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[PATCH] E
n
able and
fix support for ba
s
e less merg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivi
n
en
[
P
ATCH] Teach
git-l
s
-f
i
les about '--
'
to denote
end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Kuivinen
[PAT
C
H] Teach the recursive
merge strategy about ren
a
mes
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
rik Kuivinen
[PAT
C
H] Mo
r
e descriptive me
s
s
a
ges for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kuivinen
[PATC
H
] recursi
v
e-merg
e
: Don't pri
n
t a st
a
ck trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
i
v
i
nen
[PATCH] Use the 'd
i
e'
function where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
K
uivinen
[P
A
T
C
H]
Use a temporar
y
index file when we me
r
ge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
Kuivinen
[
PATCH
]
Ad
j
ust gi
t
-merge-recu
r
si
v
e
.
py f
o
r
the new
t
ool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
ed
r
i
k Kuivinen
[
PATCH] Don't o
u
tput '
A
utomatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[PAT
C
H] Be
more
l
ike the
'
reso
l
ve' s
t
rategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Ku
i
vin
e
n
[PATCH] Rename the 'fredrik' merge
strategy to '
r
ec
u
rsi
v
e'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivinen
[
PATCH
]
Mak
e
t
he ProgramError class print
a
ble
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuiv
i
ne
n
[P
A
TCH] Make sure
we die if w
e
don't get
eno
u
gh arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
AT
C
H]
Intro
d
uce
a
'
die'
funct
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Ku
i
v
i
nen
[PATCH] Exit with status cod
e
2
i
f we
g
e
t an except
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivi
n
en
[PATCH] Fix as
s
ertion failure
whe
n
m
erging common anc
e
stor
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
r
edrik
K
uivinen
[PATCH] Ma
k
e git-ap
p
ly under
s
tand in
c
o
m
plete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree