repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/checkout-detached' into maint
2010-01-26
Fre
d
rik K
u
i
v
i
n
en
Threaded gre
p
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-23
Fredri
k
K
uivinen
F
i
x '
g
it co
m
mit -
a
' in a newly initialized r
e
pos
i
tory
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredrik Kuivi
n
en
Docum
e
ntation/i18n
.
txt: it is
i
18
n
.
com
m
i
tencoding not
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fr
e
dr
i
k Kuivinen
R
e
a
d the config in
r
ev-list
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredrik K
u
ivinen
Ne
w
a
u
toconf test for iconv
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-01-06
Fredr
i
k K
u
ivinen
insta
w
e
b: Nicer error message when the http d
a
e
mon
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
Fredrik Kuivinen
blame: Add --ti
m
e to p
r
o
duce ra
w
timestamps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fredrik Kuivinen
Update the docume
n
tation for
gi
t
-mer
g
e-b
a
se
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik Kuivi
n
en
blame: Fix path pruning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik
K
uivinen
Makefile: Add TAGS and ta
g
s ta
r
gets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fre
d
r
i
k Kuivi
n
e
n
blame: Fix git-bl
a
me <di
r
ectory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik
K
ui
v
inen
blame: Nice
r
output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
blame: Rename
d
etec
t
ion (take 2
)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
re
v
-lib
:
Make it easy t
o
do re
n
am
e
tracking (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredri
k
Kuivinen
Make it possible to n
o
t clobber obje
c
t
.
util
i
n sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fred
r
ik
Kuivi
n
en
Ni
c
er output
f
rom 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivin
e
n
Remove
t
railin
g
dot aft
e
r short
d
e
s
cription
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Fix some inconsistencie
s
in t
h
e
d
ocs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik
K
ui
v
in
e
n
git-blame:
U
s
e
the same
t
e
sts for git-b
l
ame
a
s
f
or
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik Kuivinen
g
it-blame: M
a
ke t
h
e ou
t
pu
t
human readab
l
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik
K
uivinen
git-b
l
ame, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik K
u
ivi
n
en
A
d
d git-blame, a tool for assi
g
ni
n
g b
l
a
m
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredr
i
k Kuivinen
s
/
S
HEL
L
/SHELL_PATH/ in Ma
k
efile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
e
d
rik Kuivinen
merg
e
-recursive
:
Speed up commit grap
h
construct
i
on
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
m
erge-rec
u
rsive: Ma
k
e use of pro
v
ided ba
s
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
git-b
r
an
c
h: Doc
u
menta
t
ion
fi
x
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredr
i
k Ku
i
v
i
nen
merge-r
e
cu
r
sive: Improv
e
the er
r
or message print
e
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fre
d
rik Kuivin
e
n
git-
w
h
a
tch
a
nged:
A
dd usage s
t
r
ing
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
Kuivinen
git-log: Add us
a
ge string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k Kuivinen
git-d
i
ff: U
s
age string c
l
ean-
u
p
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
re
d
rik Kui
v
i
nen
Usage message clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
inen
New
tes
t
case: Criss-
c
ross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New test case:
m
erge with directory/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Ku
i
vinen
test
-
lib
.
sh:
A
d
d n
e
w fun
c
tion, test_
e
xpect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
drik Kuivinen
git-
m
erge: Exit with c
o
de 2 if
no strategy was ab
l
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
K
u
ivinen
merge-recursive: Replace '
e
x
c
ep
t
:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-
r
ecursive:
U
se '~'
i
nstead of '_' to se
p
arate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivi
n
en
merge-recursive: Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuiv
i
nen
merge
-
recurs
i
v
e
:
Indent the
o
utput
p
r
operly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edri
k
Kuivinen
merge-re
c
ursiv
e
: Fi
x
su
p
port for branch name
s
c
o
ntai
n
i
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k
Kuivinen
merge-recu
r
sive
:
F
i
x
lim
i
ted o
u
tput of
r
e
name messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
me
r
ge-r
e
c
ursive: On
l
y prin
t
relevant
r
e
n
ame
mes
s
ages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fre
d
ri
k
Kuivinen
[PA
T
CH]
E
nable
and fi
x
sup
p
ort f
o
r bas
e
less
m
erg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH]
T
eac
h
git-ls-f
i
les about '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivin
e
n
[PA
T
CH] Te
a
ch t
h
e recur
s
i
v
e
mer
g
e strat
e
gy
a
bout re
n
a
m
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik K
u
i
vinen
[PATCH] Mo
r
e
de
s
criptive messages
f
or co
n
flict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Ku
i
vinen
[PAT
C
H
] recursive-
m
erg
e
:
Don
'
t pr
i
nt a st
a
ck trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[P
A
T
C
H] Use the
'
die'
f
unction where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
CH] Use a temporary index file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuiv
i
nen
[
P
ATCH]
Adjust gi
t
-merge-re
c
ursive
.
p
y
for t
h
e new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[PAT
C
H] Don't output 'Autom
a
ti
c
m
e
rge fa
i
l
ed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik Kuivinen
[PAT
C
H] Be more
l
ike the
'
resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
d
rik Kuiv
i
n
e
n
[PATCH] Rename the
'
f
r
e
d
r
i
k' m
e
rge strategy to 'r
e
cursi
v
e'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
ed
r
ik Kuivinen
[PATCH] Make
the ProgramError cla
s
s pr
i
ntable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
dr
i
k Kuivinen
[P
A
TCH]
M
a
ke sure w
e
die
i
f
w
e
d
o
n't
get
e
nough arg
u
me
n
ts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
I
ntro
d
uce
a
'die'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivi
n
en
[PATCH] Ex
i
t with
stat
u
s cod
e
2 if we g
e
t an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivin
e
n
[
PATCH] Fix assertion failure when me
r
ging comm
o
n
a
ncestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
redr
i
k Kuivi
n
en
[PATCH] Make git
-
a
p
p
l
y
understand incomplete
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree