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-blame, take 2
2006-03-02
F
redrik K
u
i
v
i
nen
git
-
blame, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fr
e
drik Kuivinen
Add
g
it-bl
a
m
e
, a
tool for assig
n
ing blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Kuivinen
s/SHELL
/
SHEL
L
_PATH/ in Make
f
ile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik K
u
ivinen
m
erge-recursi
v
e:
Spe
e
d up
c
ommit
g
r
aph c
o
nstruction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
edr
i
k Kui
v
inen
merge-recur
s
i
v
e: Mak
e
u
s
e of p
r
o
vided
ba
s
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kui
v
inen
gi
t
-bran
c
h:
D
ocumentat
i
o
n fix
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
mer
g
e-recursive: Improve the error message printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik
K
uivinen
g
i
t-whatchanged: Add usag
e
string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Ku
i
v
i
nen
git-log:
A
d
d
u
sage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
e
drik Kuiv
i
nen
git-diff: Usage string
clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
red
r
ik Kuivi
n
en
Usage m
e
s
s
age
c
le
a
n
-
up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Ku
i
v
inen
New test case: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
Kuivine
n
New test case
:
m
e
rg
e
wi
t
h
directory/file
c
onflic
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivinen
test-lib
.
sh:
Add n
e
w
function, te
s
t
_
expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edr
i
k
Kuiv
i
nen
git-
m
erge:
E
xit with code 2 if no stra
t
egy w
a
s abl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
Kuivinen
m
erg
e
-recursive: Replace 'except:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
e
d
rik Kuivi
n
en
me
r
ge-re
c
ursive: Use '~' instead of
'
_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-
r
e
c
u
r
sive
:
Add copy
r
ight notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivi
n
en
merge-rec
u
rsive: Ind
e
nt
t
he ou
t
put properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Kuivinen
merge-recur
s
ive: Fix support
for branch
n
a
mes
con
t
ainin
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
d
r
ik Ku
i
vinen
merge-recur
s
ive: Fix lim
i
ted output
o
f rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
mer
g
e-recursive: Only print
r
e
levant rena
m
e messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fr
e
drik Kui
v
i
n
e
n
[PATC
H
] Enable and fix support for base
l
ess merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k K
u
iv
i
nen
[PATCH] Teach git
-
ls-files
a
b
out '--'
to den
o
te end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k Kuivinen
[PATCH] Teac
h
the r
e
cursive
m
er
g
e
strategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
Kuivinen
[
P
ATCH] More descr
i
pti
v
e m
e
ssages for conflict
c
ases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redri
k
Kuivinen
[PA
T
CH] recursive-me
r
ge: Don'
t
p
r
i
nt a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivi
n
e
n
[PATCH] Use the 'die
'
function wh
e
re it i
s
app
r
opriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PATCH] Use a temp
o
rary ind
e
x file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
K
uivinen
[PATCH] Adjust
g
it-me
r
ge-rec
u
r
s
ive
.
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 '
A
utomatic
m
erge
f
ailed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
ed
r
ik Kuivinen
[PA
T
CH] B
e
more like the 'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Ku
i
vinen
[
PATCH] Rename the 'fredrik' merge stra
t
e
g
y to 'r
e
c
u
rsiv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik K
u
ivi
n
e
n
[
PATCH] Ma
k
e the
Pr
o
g
r
amError cl
a
s
s
p
r
intab
l
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kui
v
in
e
n
[PATCH
]
M
a
ke sure we
d
ie i
f
we don't get enough
ar
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PA
T
CH
]
Introduce a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik
K
uivinen
[PAT
C
H] Exit with statu
s
cod
e
2
i
f we get
a
n
e
xception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik
K
uivin
e
n
[
P
ATCH] Fix as
s
ertion failure when
m
e
rging
c
ommon ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
r
edr
i
k Kuivinen
[PATCH] Make
g
it-apply understa
n
d i
n
complete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree