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
Merge branch 'js/name-rev-fix'
2007-02-18
Fredrik
K
uivinen
D
ocumentat
i
on/i18
n
.
txt: it is i18n
.
commitencod
i
n
g
not
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fred
r
ik Kui
v
in
e
n
Read the conf
i
g in
rev-lis
t
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-01-06
Fredr
i
k Kuivi
n
en
instaweb: Nicer er
r
or me
s
sage when the ht
t
p
daemon
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
Fredrik Kuivinen
blame: Add --time to prod
u
ce ra
w
tim
e
s
t
amps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fred
r
ik Kuivin
e
n
U
pdate
the documentation f
o
r
g
it-merge-base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik Ku
i
vinen
blame:
Fix p
a
t
h pr
u
nin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fre
d
rik Kuivinen
Makefile: Add
TAGS and tags targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredri
k
Kuivin
e
n
b
lame: Fix git-blame <
d
irectory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
redrik
K
uivine
n
blame: Nicer ou
t
p
u
t
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuiv
i
nen
blame: Rename
d
etection (
t
ake 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
e
drik Kuivinen
rev-lib
:
Mak
e
it
e
as
y
to do
r
e
na
m
e
tracking (ta
k
e 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredr
i
k
Kui
v
inen
Make i
t
possible to not clobber
ob
j
ect
.
util in so
r
t_in_to
p
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
redrik Kuivin
e
n
N
icer output from '
g
it'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Remove t
r
ai
l
ing dot after sh
o
r
t d
e
scriptio
n
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fred
r
ik Kuivin
e
n
F
ix
some inco
n
sis
t
encies in t
h
e docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Kuivinen
git-blame
:
Use
t
he same test
s
f
o
r
git-blame as
fo
r
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik
Kuivinen
git-blame: Make the
o
utput human readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivinen
git-blame, take
2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik Kuivinen
A
d
d
g
i
t
-blame, a tool for assi
g
ning blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Kuivinen
s/SHE
L
L/
S
HELL_PATH/ i
n
M
a
kefi
l
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
red
r
ik Kuivinen
merge-rec
u
rsive:
Sp
e
ed up
c
ommit graph
construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik
K
uivinen
merge-recur
s
i
ve: Make use of provided
bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivi
n
en
git-branc
h
: Doc
u
me
n
tation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivin
e
n
merge-rec
u
rsive: Improve
t
h
e error mes
s
age p
r
i
nted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
dri
k
Kuivi
n
en
git-whatchanged:
A
dd usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik K
u
ivi
n
en
git-log: Ad
d
usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
e
d
r
ik Kuivine
n
g
i
t-diff: Usage strin
g
clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredr
i
k
Kuivinen
U
s
age me
s
sage clea
n
-up, take
#2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New test case: Criss-c
r
oss merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
d
r
i
k
K
u
ivin
e
n
New te
s
t case: merge with directory/fi
l
e
conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
K
uiv
i
nen
test-lib
.
sh: A
d
d
new fu
n
ction, test_exp
e
ct_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k K
u
ivinen
git-m
e
r
g
e: Ex
i
t with c
o
d
e
2 if
n
o strat
e
gy
was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
merge-
r
ecursi
v
e:
Replace '
e
xce
p
t:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik Kuivinen
merge-recursive: Use
'~' instead of
'
_'
t
o s
e
parate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Kuivinen
merge-recu
r
si
v
e: Add copyright n
o
t
ice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursiv
e
: Indent the output prope
r
ly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuiv
i
nen
merge-recursive
:
Fix
s
upport for branc
h
names c
o
ntaini
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik Kui
v
inen
merge-rec
u
rsive: Fix l
i
m
ited output of rename me
s
s
a
g
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredr
i
k Kuiv
i
nen
m
erge-recursive: On
l
y
p
rint relevant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
edrik Kuivinen
[PA
T
CH]
E
nable
a
nd f
i
x support for base less merge
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivine
n
[PA
T
CH
]
Teac
h
git-ls-files about '--
'
to deno
t
e end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
ed
r
ik Kuivinen
[PATCH] Teac
h
the recu
r
siv
e
me
r
ge str
a
tegy about
r
enames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kuiv
i
n
e
n
[
P
ATCH] More de
s
cr
i
ptive messages for c
o
nflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kuivine
n
[PATCH] recursive-merge: Don't p
r
int a st
a
ck trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PAT
C
H] Use the 'die' function
w
here i
t
is app
r
opriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivi
n
en
[
PATCH]
Use a
t
e
m
porary index
f
i
le when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[
P
ATCH]
Ad
j
ust g
i
t-m
e
rge-recursive
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[PATCH]
Don't output 'Automatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
Kuivi
n
en
[PATCH] Be more like the 'resolve' strat
e
gy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivine
n
[PATCH] Ren
a
me the 'fred
r
i
k
'
merge stra
t
egy
to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vinen
[
PAT
C
H] Ma
k
e
t
he ProgramError class p
r
intable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuiv
i
nen
[
PAT
C
H] Make sure we die if we
don'
t
get e
n
oug
h
arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
dr
i
k
Kuivinen
[PATCH] Introduce a
'die
'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATCH] Exit wi
t
h
status
code 2 if we
g
et
a
n exceptio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[PATCH
]
Fix ass
e
rtion
f
ailure when mergi
n
g comm
o
n ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivin
e
n
[PATCH] Ma
k
e
g
it-apply understand inc
o
mp
l
ete
l
ines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree