repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Auto-quote config values in config.c:store_write_pair()
2007-01-06
Fredrik K
u
ivin
e
n
in
s
t
a
web: Nicer error message
when the ht
t
p da
e
mon
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
F
r
edrik Kuiv
i
nen
b
lame: Add --
t
ime to p
r
oduce raw
time
s
tamps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fredr
i
k Kuivi
n
en
Up
d
ate
the do
c
umenta
t
i
o
n for gi
t
-merge-b
a
se
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik Kuiv
i
ne
n
b
lame: Fix path p
r
uning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredr
i
k Kuivinen
Makefi
l
e: Add TAGS and tags targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik K
u
ivinen
blame: Fix
git-blam
e
<directory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik
K
uivinen
blame: Nicer output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivine
n
blame
:
R
e
nam
e
detection (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
rev-li
b
: Make it easy to do rena
m
e tracking (tak
e
2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fr
e
drik Kuivinen
M
ake it p
o
ssible to not c
l
obber objec
t
.
util in so
r
t_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fred
r
ik Kuiv
i
nen
Nicer
o
utput fr
o
m 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredri
k
Kuivinen
Remove t
r
ailing dot
a
fter s
h
ort desc
r
i
p
t
ion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik K
u
ivinen
F
ix some
i
nconsistencie
s
in the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Kuivi
n
en
gi
t
-b
l
ame: Use the same tests for git
-
blame
a
s for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fr
e
drik K
u
ivinen
git-blame: Make the output human read
a
ble
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik
K
uivinen
git-blame,
t
ak
e
2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredr
i
k
Ku
i
v
inen
Add git-
b
l
a
m
e
,
a
t
ool fo
r
a
s
s
i
gnin
g
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredr
i
k
Kuivin
e
n
s/SHELL/SHEL
L
_PATH/ in Makefi
l
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
e
d
r
ik Kuivinen
merge-recurs
i
ve: S
p
eed up comm
i
t gra
p
h construct
i
o
n
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
edrik Kuiv
i
nen
merge-recurs
i
ve: Make u
s
e
of provided ba
s
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fre
d
rik
K
uivinen
git-
b
ranch: Documentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
m
erge-r
e
cursive: Im
p
rove the error m
e
ssage pri
n
ted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik
K
ui
v
inen
git-whatchanged: Add usage
s
t
r
in
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
Kuiv
i
n
en
git-l
o
g: Add usage
s
tring
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
Kuivinen
git
-
diff: Usage stri
n
g
c
lean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
r
e
drik Kuiv
i
nen
Usa
g
e message clean-up,
t
ake #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivin
e
n
New test case: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edr
i
k Ku
i
vi
n
e
n
New test case: mer
g
e with directory/file
c
o
n
f
lic
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
Kuivi
n
en
test-li
b
.
sh:
A
dd n
e
w
f
unc
t
ion, test_
e
xpect_co
d
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
ed
r
ik Kuivi
n
en
git
-
m
e
rg
e
: Exit with code
2
if no strategy
wa
s
able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuiv
i
n
e
n
merge-recursive: Repla
c
e 'exc
e
pt:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik
Kuivinen
merge-recursiv
e
:
Use '~' instead of '_' to sepa
r
ate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive
:
Add
c
o
pyrigh
t
notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k
K
uivi
n
en
merge-rec
u
rsive: I
n
dent
th
e
output prop
e
rly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuiv
i
nen
me
r
ge-recursive
:
Fix support
f
or
b
ran
c
h
n
am
e
s conta
i
ning
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Kuivinen
merge-recursiv
e
: Fix limited ou
t
put of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
redrik Kuivinen
m
erge-recu
r
s
i
ve:
Only print releva
n
t r
e
name
messag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuiv
i
nen
[
PAT
C
H] Enable and fix support for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik Kuivinen
[P
A
TCH] T
e
ach
g
i
t-l
s
-files
a
bout '--' to denote
end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATC
H
] Teach the recur
s
iv
e
merge strategy a
b
out renam
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik
Kuivinen
[PATCH] Mor
e
de
s
cr
i
ptiv
e
messages for co
n
flict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivinen
[
PATCH] recursive-mer
g
e: Don'
t
print a
s
tack tr
a
ce
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
K
uivin
e
n
[
P
A
T
C
H]
U
s
e
the 'die' func
t
ion where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Use a te
m
p
o
rary index file when we merge
t
he
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] A
d
just git-merge-
r
ecurs
i
ve
.
py fo
r
the
new
t
ool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PAT
C
H] Don
'
t output 'Automatic m
e
rge
f
ailed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
nen
[PATC
H
] Be more like
t
h
e
'
resolve
'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Ku
i
vinen
[PATCH]
Ren
a
me the 'f
r
edrik
'
m
e
rge strategy
t
o
'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
i
n
en
[PATCH
]
M
a
ke the Pr
o
gramError class prin
t
able
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kui
v
inen
[PATCH] Make sure we die if we don't get eno
u
g
h a
r
g
u
ments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATCH]
I
n
t
ro
d
uce a 'die'
f
unction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
PATC
H
] Exit with
status
code 2
if we get an except
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[
P
A
T
CH]
F
ix
as
s
er
t
io
n
fai
l
ure w
h
en m
e
r
ging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kui
v
inen
[PATCH] Make gi
t
-a
p
ply under
s
t
and incomplete line
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree