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
git-blame: Make the output human readable
2006-03-05
Fredrik Kuiv
i
nen
git
-
bl
a
me:
Mak
e
the output 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
Fredr
i
k
K
uiv
i
nen
Add git-blame, a to
o
l
for assigni
n
g blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fr
e
drik Kuivinen
s/SHELL/SHELL_PATH/
in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fre
d
rik Kuivinen
me
r
g
e
-recursive: Speed up commit graph constructio
n
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
redr
i
k Ku
i
vinen
merge-recursive: Make use of provide
d
bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fred
r
ik Ku
i
vinen
git-branch:
D
o
cum
e
ntation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
redrik Kuivinen
merg
e
-re
c
u
r
sive: Improv
e
the
e
r
r
o
r messa
g
e printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fre
d
ri
k
Kui
v
inen
git-w
h
atcha
n
ged: Add us
a
ge string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
dr
i
k
Kuiv
i
nen
git-l
o
g: Add usage stri
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fred
r
ik Ku
i
vine
n
git-diff: Usage string
clean
-
up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivi
n
en
Usa
g
e
m
essage clean-u
p
,
t
ake #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivin
e
n
New test case:
C
riss
-
cross merg
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
n
e
n
New test c
a
se: me
r
ge with directory/fil
e
conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
u
i
vinen
test-lib
.
sh:
Add new function, test_exp
e
ct_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivinen
git-merge: Exit wi
t
h code 2 if no strategy was
a
bl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredr
i
k Ku
i
vinen
merge-recursive
:
Replace '
e
xcept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivine
n
mer
g
e-recursive: Use '~' instead of
'_' to
separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Ku
i
v
i
nen
me
r
ge-
r
ecursive:
Add
c
opyright not
i
ce
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive: Indent the o
u
tput pr
o
p
e
rly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
redri
k
Kuivin
e
n
m
e
rg
e
-
recursi
v
e: Fi
x
sup
p
ort
fo
r
bran
c
h n
a
mes containin
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
redrik Kuivinen
merge-
r
ecursive: Fix limited o
u
tput of rename m
e
ssages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fr
e
d
r
ik Kuivin
e
n
me
r
g
e
-recursive:
O
nly pr
i
nt relev
a
nt rename m
e
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivi
n
en
[PATCH] E
n
able and fix support for base le
s
s mer
g
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[P
A
TCH] Tea
c
h gi
t
-ls
-
files abo
u
t '--' to denot
e
e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teach the recursive merge strategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kuivinen
[PATCH]
M
or
e
d
e
s
c
r
iptiv
e
messages fo
r
confli
c
t
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redri
k
Kuivinen
[PATCH] recursive-merge: Don't print a sta
c
k trac
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATCH] Use the
'
d
ie' fu
n
c
tion whe
r
e i
t
is appro
p
r
i
ate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH] Use a tem
p
ora
r
y in
d
ex file
w
he
n
we merg
e
t
h
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PAT
C
H
]
Adjust
git-me
r
g
e
-re
c
ursi
v
e
.
p
y
for the n
e
w
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
n
e
n
[PATCH] Don't output
'Automatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
ri
k
Kuivinen
[P
A
TCH
]
Be
m
ore
like th
e
'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kui
v
inen
[PATCH] Rename the 'fredrik' merg
e
strateg
y
to 'rec
u
rsive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[PATCH] Make the ProgramError class
p
ri
n
tabl
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
re
d
ri
k
Kuivi
n
e
n
[PATCH] Make sure we die
i
f we don't get enou
g
h ar
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik
Kuivin
e
n
[PA
T
CH] Int
r
oduc
e
a 'die'
func
t
io
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
r
i
k
Kuivinen
[
P
ATCH] Exit w
i
th status code 2 if
we get an e
x
ception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
i
vin
e
n
[PATCH]
Fix as
s
ertio
n
failu
r
e when
m
er
g
ing common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredr
i
k
K
u
i
vinen
[PATCH] M
a
ke git
-
apply under
s
tand incomple
t
e lin
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree