repo.or.cz
/
git
/
repo.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add git-blame, a tool for assigning blame.
2006-02-21
Fredrik Kuivinen
Add
git-blame, a tool
for assigning blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Kuivi
n
en
s/SHELL/SHELL_PATH/ in Mak
e
f
il
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fr
e
dr
i
k Kuivinen
me
r
ge-r
e
c
ursive: Speed up comm
i
t graph c
o
nstr
u
c
t
ion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fr
e
d
rik K
u
ivinen
merge-recursive
:
Mak
e
u
se of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik K
u
ivi
n
en
git-bran
c
h: Doc
u
m
e
ntat
i
on fi
x
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
r
edrik Kuivinen
merge-re
c
ur
s
ive: Improve the error message printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-whatchanged:
Ad
d
us
a
g
e
strin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
gi
t
-log
:
A
dd u
s
age string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
K
u
i
vinen
g
i
t-d
i
ff: Usage
s
t
ring clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usage
m
essage clean-up, take
#
2
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
d
rik
Kuivi
n
en
New test cas
e
: Cri
s
s-cross me
r
ge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
K
uivinen
New
t
est case
:
merge with
d
irectory
/
file conflicts
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_e
x
pe
c
t_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
git-merge: Exit with
code
2
if n
o
strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
redrik Kuivinen
m
erge-recurs
i
v
e: Repla
c
e 'exc
e
pt:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik K
u
ivinen
m
e
rge-recursive
:
Use '~'
i
nstea
d
of '
_
'
t
o
separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Ku
i
vi
n
en
merge-rec
u
rsive:
Add cop
y
right notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
ed
r
ik Kuivinen
merg
e
-recursi
v
e: Indent the output p
r
operly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredri
k
Ku
i
vinen
merge-recursiv
e
: Fix supp
o
rt for branc
h
names con
t
a
i
ning
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Ku
i
vinen
merge-recursive: Fix l
i
mited output of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredri
k
Kuivinen
merge-recursive: Only prin
t
relevant rename
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
edrik Ku
i
vinen
[PATCH] Enable an
d
fix suppo
r
t for base l
e
ss merge
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k Kuivinen
[PATCH] Teach g
i
t-ls-files about '--' to denote
e
nd
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Kuivinen
[PATCH] Teach th
e
r
ecursive merge stra
t
egy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PAT
C
H] More de
s
cr
i
ptiv
e
messages for conflict c
a
ses
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik
Kuivinen
[P
A
TCH
]
rec
u
rsive-mer
g
e: Do
n
't print a s
t
ack tr
a
ce
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivi
n
en
[PATCH] Use
t
he
'
die' fu
n
ction wh
e
re
i
t is
appropria
t
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edri
k
Kuivinen
[PATC
H
] Use a tem
p
orary index
f
il
e
whe
n
we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PA
T
CH] Adj
u
st git-merge-recursi
v
e
.
p
y f
o
r the
n
ew tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
rik Kuivinen
[PATCH] Don't
o
u
t
put
'Automatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH] Be more like th
e
're
s
o
l
ve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
i
v
inen
[PA
T
CH] Rena
m
e
th
e
'fr
e
d
rik' merge
s
trateg
y
to
'rec
u
rsive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
ed
r
ik
K
uivinen
[
P
A
TCH
]
Make
the Progra
m
Error class prin
t
able
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATC
H
] Make sure we die
i
f we don't get en
o
ugh argume
n
ts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[P
A
TCH] Intr
o
duce a '
d
ie' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[PATCH] Exit
w
i
t
h
status code 2 if we get an e
x
cepti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
d
r
ik Kuivinen
[PATCH]
F
i
x as
s
ertion failure wh
e
n
merging c
o
mmon
a
ncestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fr
e
drik
K
uivinen
[PATCH] Make git-apply understa
n
d
i
n
com
p
lete
l
ines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree