repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
http-fetch: Tidy control flow in process_alternate_response
2006-02-02
F
r
edrik Ku
i
vine
n
merge-r
e
cursive: Speed up commit graph
c
onstr
u
c
t
ion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fred
r
i
k
Kui
v
i
n
e
n
merge-recursiv
e
:
Make use of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
git-branch: Doc
u
me
n
t
a
ti
o
n fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivin
e
n
merge-recursive: Improve
t
he erro
r
message pri
n
t
ed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k Kuivinen
git-wh
a
tchanged: Add
u
s
age string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
redrik Kuivinen
git-log: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-diff: Usage
strin
g
clean
-
up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usage mes
s
age
clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
i
k
Kuivinen
New tes
t
cas
e
: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivine
n
New test
c
as
e
: mer
g
e with
d
ire
c
tory/fil
e
c
on
f
l
icts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivine
n
test-lib
.
sh
:
Add
n
ew function,
t
est_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik
Kuivinen
g
it-
m
erge: E
x
i
t
w
ith
code
2 if n
o
str
a
tegy was a
b
l
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredr
i
k K
u
ivinen
merge-recursive: Re
p
la
c
e
'ex
c
ept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik Kuivinen
mer
g
e-recur
s
ive: Use '
~
' instead
o
f '_
'
to sep
a
rate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivinen
merge-recursive: Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivinen
m
e
rge-rec
u
rsi
v
e: Inde
n
t the
o
utp
u
t
properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k
Kuivinen
merge-r
e
cursive: Fix suppor
t
for branch
n
a
m
e
s conta
i
n
ing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
m
erge-recursive
:
Fix limited output of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge-recurs
i
ve: Only pri
n
t rele
v
ant rename
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[PATCH] Enabl
e
a
n
d fix
s
upport
for b
a
se le
s
s merg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PA
T
CH] Teach git-ls-files about '--' to
d
enote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivin
e
n
[PATCH] Teach the recursive merge strategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
uivinen
[
P
A
T
C
H
] More descriptive me
s
sages
f
or confli
c
t cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k
K
uivinen
[PATCH] rec
u
rsive-me
r
ge: D
o
n't pri
n
t a stack
t
rac
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
in
e
n
[PATCH]
U
s
e
t
he 'd
i
e' fun
c
tion where it is app
r
opriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Use a te
m
p
o
rary index file w
h
en we mer
g
e
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[
P
AT
C
H] Adjust git-merge-recursive
.
p
y for
the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[
PATCH] Don'
t
outpu
t
'Automati
c
merge fai
l
ed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
r
i
k Kuiv
i
nen
[PATCH] Be
m
or
e
like the '
r
e
s
ol
v
e' s
t
rategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PATC
H
] Rena
m
e the 'fredr
i
k' merge str
a
tegy to
'recurs
i
ve'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivinen
[PATCH] Make the ProgramError
c
las
s
printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[PATCH] Ma
k
e sure
w
e die if we don't get enough argumen
t
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik
Kuivin
e
n
[PATCH] Introduce a '
d
ie' funct
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
K
u
ivinen
[PATCH] Exit with s
t
atu
s
c
o
de 2 if we get an excep
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuiv
i
nen
[P
A
T
C
H] Fix as
s
er
t
ion f
a
i
l
ure when mergi
n
g
c
ommon ances
t
or
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik Kuivin
e
n
[PATCH] Mak
e
g
i
t-apply und
e
rstand incomplet
e
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree