repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
test-delta needs zlib to compile
2006-03-06
F
r
edrik Kuivinen
git-bl
a
me
:
Us
e
t
he
same tests f
o
r git-bl
a
m
e
as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredri
k
K
u
i
v
in
e
n
gi
t
-blame: Make the output
human
r
e
a
dable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fre
d
r
i
k Kuivi
n
en
git-
b
la
m
e,
take
2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fr
e
dri
k
Kuiv
i
nen
Add git-b
l
ame, 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/SHELL_PATH/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
edrik Kuivinen
merge-recursive
:
Speed up c
o
mmit graph
c
ons
t
r
uction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fre
d
r
ik Kuivinen
merge-recursive: Make
use
o
f
p
rovided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik K
u
ivinen
git-b
r
anch
:
Do
c
umentation
f
i
xes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fr
e
drik Kuiv
i
nen
merge-recursive: I
m
prove the error me
s
sage p
r
in
t
ed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivi
n
en
git-what
c
hang
e
d: Add us
a
g
e
st
r
ing
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
drik Kuivine
n
git-
l
og
:
Add usag
e
string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
redrik Kuivine
n
git-diff: Usage string c
l
ean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
r
e
drik Kuivinen
Usag
e
m
essage c
l
ean-up, ta
k
e
#2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivine
n
New test c
a
se: Cri
s
s-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redri
k
Kuiv
i
nen
New
t
est
case: merge wit
h
direc
t
ory/f
i
le conflict
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
test-li
b
.
sh: Add
new function, test_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivinen
g
i
t-
m
erge: Exit with code
2
if no s
t
rategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fre
d
rik Kui
v
inen
merge-recursive: Replace 'ex
c
ept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
Ku
i
vinen
merg
e
-recursive: Use '~' instea
d
of
'
_' to s
e
parate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
e
d
r
ik Kui
v
ine
n
me
r
ge-recursi
v
e: Ad
d
copyright noti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
redrik Kui
v
inen
mer
g
e-re
c
ursive: Inden
t
the ou
t
put properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredri
k
Kuivi
n
en
merge-r
e
cursiv
e
: Fix
sup
p
ort for branch names contai
n
ing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik Kuivi
n
en
m
e
r
g
e
-r
e
cur
s
i
ve: Fix
limited output of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
m
e
rge-recur
s
ive: Only print relevant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fr
e
drik Kuivinen
[PATCH] Enable and
f
ix suppo
r
t
for bas
e
less me
r
g
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Ku
i
v
inen
[
PATCH] T
e
ach git-ls-files about
'--'
t
o
denote e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik K
u
ivinen
[
PATC
H
] Teach the re
c
u
r
sive me
r
ge stra
t
egy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Kuivinen
[PATCH] More descriptive messages
f
or conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kui
v
inen
[PATCH] r
e
cursive
-
merge: Don't print a stack t
r
ace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Ku
i
vinen
[PATCH]
U
se
t
he 'die' functio
n
where
i
t is
a
ppropr
i
ate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuiv
i
nen
[PA
T
CH] Use a temporary index file when
w
e me
r
ge
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Adjust git-merge-recursive
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k K
u
ivinen
[PATCH] Don't output 'Automatic
me
r
ge fa
i
led,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
u
ivinen
[P
A
T
C
H] Be more like
th
e
'reso
l
ve'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Rename the 'fredrik' merge strategy to
'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make the ProgramEr
r
or class printa
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
ATCH] Make
s
ure
we die if
we don't get enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivin
e
n
[PATCH]
I
ntroduc
e
a 'die' fun
c
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PAT
C
H
] E
x
it wit
h
status c
o
de 2 if we
g
e
t
an
exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATCH] F
i
x assert
i
on fail
u
re when merging co
m
mon ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik Kuivinen
[PA
T
CH] Make git-apply understand
incomplete line
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree