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
Fred
r
ik
Kuivinen
git-
b
lame
,
t
a
ke 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik Kuivinen
Add git-blame,
a tool for
ass
i
gning blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
F
redrik Kui
v
inen
s/SHELL/SH
E
LL_PATH/
i
n Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kui
v
inen
merge-recur
s
ive: Sp
e
ed up com
m
i
t
gra
p
h con
s
t
r
uction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fre
d
rik Kui
v
inen
mer
g
e
-
recursive: M
a
ke use of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
git-
b
ranc
h
:
Docum
e
n
tation fixe
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
me
r
ge-recursiv
e
: Impro
v
e the
e
rror message printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
red
r
ik Kuivinen
git-whatcha
n
ged: Add
usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k Kuivinen
g
i
t
-log: Ad
d
usage s
t
ri
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivi
n
en
g
it-diff: Usage st
r
ing clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
U
s
age message cle
a
n-up, take
#
2
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
i
k
Kuivinen
Ne
w
test cas
e
: Cr
i
ss-cross
merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k
K
uivinen
N
e
w
test
c
ase:
m
er
g
e with directory/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kui
v
inen
tes
t
-lib
.
sh: Add new function, test_expect_
c
ode
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivi
n
en
git
-
m
e
r
ge: Exi
t
with code 2
i
f no stra
t
e
g
y was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuiv
i
nen
merge-
r
ecursive
:
Replac
e
'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
mer
g
e-rec
u
r
s
ive: U
s
e '~'
in
s
tead of '_' to se
p
arate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
i
v
inen
merg
e
-rec
u
rsive: Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edri
k
K
uivinen
merge-recursive: In
d
ent the output
proper
l
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
e
drik Kuivinen
me
r
ge-recursive: F
i
x
support for branch names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivi
n
en
merge-
r
ecursive: Fix l
i
m
i
t
ed o
u
tp
u
t of
r
ename mess
a
ges
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik K
u
ivinen
merge-recursiv
e
: Only print re
l
ev
a
nt ren
a
me
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[PATCH] Enabl
e
an
d
fix support for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
u
i
vinen
[PATCH] Tea
c
h gi
t
-
l
s
-f
i
les
a
b
o
u
t '--'
to denote
e
nd
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredri
k
Kuivinen
[PATCH] Teach th
e
recursi
v
e merge str
a
tegy abo
u
t rena
m
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edr
i
k Kuivinen
[PA
T
C
H
] More descriptive mes
s
ages
for con
f
lict
c
a
s
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
Kuiv
i
n
e
n
[PATC
H
]
rec
u
r
s
ive-merge: Don't
print
a
st
a
ck trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[PATCH] Use the 'd
i
e
'
fun
c
tion where i
t
is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
u
i
v
inen
[PATCH] Use a t
e
mporar
y
i
ndex file w
h
en we
mer
g
e t
h
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PAT
C
H
]
Adjust git-merge-r
e
cursive
.
p
y for the n
e
w
t
oo
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[
PAT
C
H
] D
o
n't outpu
t
'Automatic
m
erge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik Kuivinen
[PATCH] Be m
o
re like the 'reso
l
ve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATCH] Rena
m
e the 'f
r
edrik' merge st
r
ategy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[PATCH] Make the Progr
a
mError class printa
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivi
n
en
[P
A
TCH] Make sure we die if we don't get enough
a
r
gume
n
ts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[
P
ATCH] Introd
u
ce a 'd
i
e
'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k K
u
i
vinen
[PATC
H
] Exit
with
sta
t
us cod
e
2 if we get an ex
c
ep
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k
K
uivinen
[
P
ATC
H
] Fix asser
t
io
n
f
ailure when merging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fred
r
ik
K
uivinen
[PATCH] Ma
k
e git-apply un
d
erstan
d
incomp
l
ete
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree