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
format-patch/commit: Quote single quote in the author name properly.
2005-12-16
Fr
e
drik Kui
v
inen
git
-
w
hatchanged: Add
usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
K
uiv
i
nen
git-log: A
d
d usage stri
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
e
d
r
ik Kuivinen
g
i
t-diff: Usage
string cle
a
n-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuiv
i
nen
Us
a
ge message clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivine
n
New t
e
s
t case: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
Ne
w
te
s
t case: merg
e
w
ith
direct
o
r
y
/file co
n
flicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
K
u
ivinen
test-lib
.
sh: Add
n
ew fun
c
tion
,
test_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuivinen
git-me
r
ge: Exit with co
d
e 2 if no strateg
y
was
a
ble
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredr
i
k Kui
v
inen
merge-re
c
ursive:
Replac
e
'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-re
c
ursive: Use '~' instead o
f
'_' to se
p
arate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Kuivinen
merge-recursive: A
d
d
copyright
noti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
r
ik
K
uivinen
m
e
r
g
e-
r
ecursive: Indent
the out
p
ut pro
p
erly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edri
k
Kuivin
e
n
merge-
r
ecursive:
F
ix s
u
pport f
o
r branch nam
e
s c
o
n
taining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivin
e
n
merge-recursive: Fix limited
o
utput of re
n
ame messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredr
i
k
Kui
v
inen
mer
g
e-recursive: Only print
r
elevant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[PATCH] Enable a
n
d fix support
f
or base les
s
me
r
ges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[P
A
T
C
H
] Teach
git
-
ls
-
file
s
about '--' to denote en
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PAT
C
H]
T
each the recursive mer
g
e strategy a
b
out renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k
Kuiv
i
nen
[
P
A
TCH] More de
s
cr
i
ptive
m
essa
g
e
s for c
o
nflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivine
n
[PATCH] recursive-me
r
ge
:
D
o
n't print
a
stack
t
race
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik
K
uivinen
[PATC
H
]
U
se the 'die' fun
c
t
i
on where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[P
A
TCH] Use
a temporary inde
x
f
i
l
e
when we merge
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
r
ik Kuivinen
[PATCH] Adjust
g
it-
m
erge-recursiv
e
.
py f
o
r the ne
w
t
ool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH] Don't output 'Au
t
o
m
atic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[P
A
TC
H
]
Be more like the 'resolve
'
s
t
rategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kui
v
inen
[PATCH]
Rename
t
h
e '
f
redri
k
' m
e
r
ge stra
t
egy to 'recursive
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik
K
uivinen
[PATCH] Mak
e
the Prog
r
amError class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
A
TCH
]
Make sure
we die if we don't get eno
u
gh a
r
g
u
ments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivi
n
en
[PAT
C
H] I
n
troduce a 'die'
f
unction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivine
n
[PATCH
]
Exi
t
with
s
tatus c
o
de
2 if we get
a
n excep
t
io
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[
P
ATC
H
] Fix
a
s
s
ertion failur
e
w
hen mergin
g
c
o
mmon ancest
o
r
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH] M
a
k
e
git-apply unders
t
and incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree