repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mz/doc-rebase-abort' into maint
2011-06-22
Fre
d
rik Ku
i
vinen
M
ak
e
file
:
Track cha
n
ges t
o
LDFLAGS a
n
d re
l
i
n
k
w
h
en
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
F
redrik
Kuivinen
Thread
e
d
g
re
p
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-23
Fred
r
ik Kuivinen
Fix 'git commit -a' in a newly initiali
z
ed reposito
r
y
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredr
i
k Kuivinen
Documentation/
i
18n
.
txt: it is i18n
.
commitenco
d
ing not
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fred
r
ik Kuivinen
Read t
h
e config in rev
-
list
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
F
redrik Kuivinen
New au
t
oconf te
s
t
f
or iconv
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-01-06
Fredrik Kuivinen
instaw
e
b: Nice
r
e
r
r
or
message when t
h
e http daemo
n
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
Fred
r
ik Kuivinen
blame: Ad
d
--tim
e
t
o produce raw ti
m
estamps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
F
redrik
Kuivinen
Update the do
c
u
ment
a
tion for git-m
e
r
g
e
-base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fred
r
ik Ku
i
vinen
bla
m
e: Fix path prun
i
ng
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik Kuivine
n
M
a
k
efile: Add TAG
S
and tags targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fr
e
d
rik Kui
v
inen
blame: Fix git-blame <directory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Ku
i
vinen
blame: N
i
cer output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
e
drik Kuivine
n
blame:
R
ename detectio
n
(take 2
)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuiv
i
nen
rev-lib:
Make i
t
easy to do
rename tracking (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik
Kuivi
n
en
Make it
p
o
s
sible to not clobber ob
j
e
ct
.
util
i
n so
r
t_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
drik Kuivi
n
en
Nicer output from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Remove trailing
d
ot
a
f
ter short d
e
scription
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
dr
i
k Kuivinen
Fi
x
s
om
e
inconsist
e
n
c
i
e
s in t
h
e d
o
cs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fr
e
dri
k
Kuivinen
git-blame: U
s
e the same tests fo
r
git
-
blame
a
s
for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik Kuivinen
git-blame:
Make the outp
u
t
hum
a
n readabl
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivinen
git-blame, t
a
ke 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik
K
uiv
i
ne
n
Add git-blam
e
, a
t
ool for assigning
b
lam
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Ku
i
v
inen
s/SHELL/SHELL_PATH/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fred
r
ik Kuivinen
merge-recursive
:
Sp
e
ed up commit graph construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Ku
i
vinen
merg
e
-re
c
ursive: Make use of provided b
a
ses
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fre
d
rik
K
u
ivin
e
n
git
-
bra
n
ch
:
Documentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fr
e
d
rik
Kuivin
e
n
merge-
r
ecursive: Improve the
error mess
a
ge printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fre
d
rik Kui
v
inen
git-whatc
h
a
n
ged:
Add usage stri
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
red
r
ik
K
uiv
i
ne
n
git-log: Add u
s
age string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik K
u
i
vin
e
n
gi
t
-diff: Usage string c
l
e
an-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usa
g
e m
e
ssage clean-
u
p,
t
ake #2
commit
|
commitdiff
|
tree
2005-12-03
F
r
ed
r
ik Kuivinen
New test case:
C
ri
s
s
-cro
s
s mer
g
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
v
inen
N
ew test case:
m
e
rge
w
i
th di
r
ectory/file
c
onflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
inen
test-lib
.
sh:
A
dd ne
w
func
t
ion
,
test
_
expect_
c
od
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-merge: Exit with code 2 if n
o
strategy was ab
l
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
r
e
drik Kuivin
e
n
merge-recursiv
e
:
Replace 'exc
e
pt:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k K
u
ivine
n
merge-
r
ecursive: U
s
e '~' inste
a
d of '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
redrik Kui
v
i
n
en
merge-r
e
cursive:
Add cop
y
right noti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
d
r
ik Kui
v
inen
merge-recurs
i
ve: Indent t
h
e output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kui
v
inen
m
e
rge-recurs
i
ve
:
Fix support for branch
n
ames conta
i
ning
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-recursive
:
Fi
x
li
m
i
ted out
p
u
t o
f
ren
a
m
e
me
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Ku
i
vinen
m
e
r
ge-recursive: Onl
y
p
r
int relevant renam
e
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Ku
i
vinen
[PAT
C
H] En
a
ble a
n
d fi
x
support f
o
r bas
e
less mer
g
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edri
k
Kuivinen
[PATCH] Teach git-ls-f
i
les about '--' to deno
t
e en
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
u
ivin
e
n
[PATCH
]
Teach the recursive me
r
ge
s
t
r
ategy about r
e
n
a
m
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kui
v
inen
[PATCH] More descrip
t
ive
message
s
for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PA
T
C
H
] r
e
cursive-me
r
ge: D
o
n't print a s
t
ack tr
a
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Ku
i
vinen
[PATCH] Use
t
he 'die' func
t
i
on where it is
appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Use
a
t
emporar
y
index file
w
hen we
m
erge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATCH] Ad
j
u
st
g
it-merge-recursive
.
py fo
r
the
n
ew tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Ku
i
vinen
[PATC
H
] Don
'
t out
p
ut '
A
utomatic mer
g
e fai
l
e
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
r
ik
K
u
i
v
i
nen
[PA
T
CH] Be more l
i
ke the 'resolve
'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Rename the 'fredr
i
k' merge strateg
y
to '
r
ecursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make the Program
E
rror
class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[P
A
TC
H
] M
a
ke
sure we di
e
if we d
o
n't get en
o
u
g
h arg
u
m
ents
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[PATCH]
Introd
u
ce a
'
die'
f
unction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[
PA
T
CH] Exit with
status code 2 if we get an ex
c
ept
i
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kui
v
inen
[PATCH] Fix assertion
f
ailu
r
e when m
e
r
g
i
ng commo
n
ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH] Mak
e
git-a
p
ply u
n
derst
a
nd inc
o
mp
l
e
te lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree