repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
test combinations of @{} syntax
2010-01-26
F
redrik
K
uivinen
Threade
d
g
r
e
p
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-23
Fred
r
ik Kui
v
inen
F
ix
'
git comm
i
t -
a
' i
n
a newly ini
t
ializ
e
d repository
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fre
d
rik K
u
ivinen
Documentation/i18n
.
txt
:
it is i18n
.
commitencodin
g
n
ot
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredrik Kuivinen
Read the config
i
n
rev-
l
i
st
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredrik Kuiv
i
nen
Ne
w
aut
o
conf test for
i
c
o
nv
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-01-06
Fredrik Kuivin
e
n
instaw
e
b: N
i
cer e
r
ror
message
when the http daemon
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
Fredrik Kuivin
e
n
b
lame: Add --time to produce r
a
w ti
m
e
s
tamps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fredr
i
k Ku
i
vinen
Update t
h
e docume
n
tation for git-merge-base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredri
k
Kuivinen
b
l
ame: Fix path prunin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik Kuivinen
Makef
i
le:
Add TA
G
S and ta
g
s t
a
rgets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
r
e
d
r
i
k Kuivinen
b
l
a
m
e: Fix git-
b
lame
<
direc
t
ory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuivinen
bl
a
me: Nice
r
o
utp
u
t
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kui
v
i
nen
blame:
Rename detection (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik
K
u
ivin
e
n
rev-lib: Make i
t
easy to do rena
m
e track
i
ng (ta
k
e 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fred
r
ik Kuivinen
Make it possib
l
e
t
o
not c
l
obber objec
t
.
u
t
il i
n
sort_i
n
_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik
K
uivinen
Nicer
output from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fre
d
rik
Kuivinen
Remov
e
t
raili
n
g
dot after sho
r
t
desc
r
iptio
n
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Fix som
e
inco
n
sist
e
ncie
s
i
n
the
d
o
cs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
F
redrik Kui
v
inen
git-blame: Use th
e
same t
e
s
t
s for git-blame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik Kuivinen
git-b
l
ame: Make
t
he
o
utput human re
a
d
a
ble
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivin
e
n
git-blame, tak
e
2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fr
e
dri
k
Kuivinen
Add git-blame, a tool for
a
ssi
g
ning blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fr
e
dr
i
k Kuiv
i
nen
s/SHE
L
L/SHELL_PATH/ in
M
ak
e
file
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge-r
e
c
u
rsi
v
e: Sp
e
e
d
u
p co
m
mit
graph
c
onstructi
o
n
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
redrik Kuivinen
mer
g
e-recursive: Make use of provi
d
ed bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik K
u
ivinen
git-bra
n
ch: Documentation fixe
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
r
ed
r
i
k Kui
v
ine
n
merge
-
recursi
v
e: Improve th
e
error messa
g
e printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fre
d
rik Kuivinen
g
it-what
c
hanged: Add us
a
ge
s
trin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-log: Add usage
s
t
ring
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-diff:
Us
a
ge
str
i
ng cle
a
n-u
p
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usa
g
e message clean
-
up, take #
2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
i
v
inen
New test case:
C
r
iss-cr
o
ss merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
inen
New test
case: merge with directory/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
test-lib
.
sh
:
Add ne
w
func
t
ion, te
s
t_e
x
pe
c
t
_c
o
de
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivinen
g
i
t-me
r
ge: 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
F
r
edrik Kui
v
inen
merg
e
-r
e
curs
i
v
e: R
e
place
'
exc
e
pt:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge
-
recursi
v
e
:
Use '~' i
n
s
te
a
d of
'_' to se
p
arat
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Kuiv
i
nen
merge-r
e
curs
i
ve: A
d
d c
o
p
yright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive:
I
ndent the o
u
t
put properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
me
r
ge-recursive: Fix
suppor
t
f
o
r
branch names containi
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kui
v
inen
merge-re
c
ur
s
ive: Fix limited output
o
f ren
a
me mes
s
a
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
redrik Kuivinen
merge-recursive
:
Only
p
rint relevan
t
r
ename
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[PAT
C
H]
Enable and
fix su
p
po
r
t for ba
s
e
less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k Kuivinen
[
P
ATCH] Teach git-ls-files about '
-
-' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
drik K
u
ivinen
[PATCH] Teach the re
c
ursi
v
e merge strate
g
y about
r
e
n
ames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kui
v
i
nen
[PATCH] M
o
re des
c
riptive
m
ess
a
g
es for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PA
T
CH] r
e
c
u
r
sive-merge:
Do
n
'
t
print a sta
c
k trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
ri
k
K
u
ivinen
[
P
ATCH] Use the '
d
i
e
' func
t
i
on
w
here it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
iv
i
nen
[PA
T
CH] Use
a
t
e
mporary index
file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
iv
i
nen
[PATCH] Adjust git-merge
-
r
ecursiv
e
.
py f
o
r the ne
w
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH]
Don't output 'Au
t
omatic merge failed
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH
]
B
e more like the
'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PA
T
CH] Rename th
e
'
f
redrik
'
merge
s
trategy
t
o
'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redr
i
k Kuivinen
[PATCH
]
Make the ProgramError
class print
a
ble
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make sure we die if we d
o
n'
t
g
e
t e
n
ough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Introd
u
ce a 'die'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kui
v
inen
[PA
T
CH]
E
x
i
t with status code 2 if we ge
t
an exceptio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik
Kuivin
e
n
[PATCH] F
i
x
assertion fa
i
lure when merg
i
ng common ancest
o
rs
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik Kuivinen
[PATCH] M
a
ke gi
t
-apply understand inc
o
mplete line
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree