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 'jc/maint-combined-diff-work-tree' into maint
2011-06-22
Fredrik Kuivinen
Makefile: Track
changes to LDFLAGS and relink when
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Fredrik Kuivi
n
en
Threaded grep
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-23
F
redr
i
k Kuivin
e
n
Fix 'git
c
ommit -a' in a new
l
y
init
i
alized repos
i
t
o
ry
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
F
redrik Ku
i
vinen
Documentation/i18n
.
t
x
t: i
t
is i18n
.
com
m
itencoding not
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredrik Kuivinen
Read the c
o
nfig i
n
rev
-
l
i
s
t
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
F
redrik
Kuivinen
N
e
w
au
t
o
conf te
s
t for iconv
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-01-06
Fredr
i
k
Kuivinen
instawe
b
: Nicer error message when
the http daemon
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
Fredrik Kui
v
inen
b
l
am
e
: A
d
d --time
t
o prod
u
c
e
raw time
s
t
amps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fre
d
rik Kui
v
in
e
n
U
pdate
t
h
e
d
o
cumen
t
ation fo
r
git-mer
g
e-bas
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik Kuivinen
bla
m
e: Fix p
a
th pruning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik Ku
i
vinen
Makefile
:
Add TAGS and ta
g
s targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Ku
i
vin
e
n
blame:
F
ix
git-blame
<
directory
>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredri
k
Kuivin
e
n
blame: Nic
e
r output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredr
i
k
Kuivine
n
b
lame
:
Rename detection (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
redrik
K
uivinen
rev
-
lib: Make it easy to do rename trackin
g
(take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik K
u
i
v
inen
Make
i
t
p
oss
i
ble to not clobber
object
.
util i
n
sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Nicer output f
r
om 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredri
k
Kuivinen
Re
m
ove trai
l
i
n
g
do
t
after short descri
p
t
i
on
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fre
d
rik Kuivinen
F
ix some inconsisten
c
ies
in
the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik K
u
ivinen
git-blame
:
Use the
s
a
me t
e
st
s
for g
i
t-blame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fr
e
drik Kuivinen
git
-
b
l
ame: Make the output human re
a
dable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivinen
git-bl
a
me, take
2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fre
d
rik
K
uiv
i
nen
Add git-
b
lame
,
a t
o
o
l
f
o
r ass
i
gning
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fre
d
rik Kuivinen
s/S
H
ELL/SHELL_PATH/ in Make
f
ile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge
-
rec
u
rsive
:
Spee
d
up commit graph con
s
truction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik K
u
ivinen
mer
g
e-recursive:
Mak
e
use of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivin
e
n
git-branch: Docume
n
ta
t
ion fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredr
i
k Kuivi
n
en
merge-recursi
v
e: Improve th
e
error
message printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git
-
wha
t
changed: Add us
a
ge s
t
ring
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
Kuivinen
git-log: A
d
d usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kui
v
inen
git-diff:
Usage
strin
g
cle
a
n-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fre
d
rik Kuivinen
Usage message clea
n
-up, t
a
k
e
#2
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
r
i
k Kuivi
n
en
New
t
est case: Criss-cross merg
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
u
i
v
i
nen
New test
c
ase: merge with direc
t
o
ry/
f
i
l
e co
n
f
licts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
test-li
b
.
s
h
: A
d
d new
functi
o
n, te
s
t_expect
_
code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
git-merge: Exit with
c
ode 2 i
f
no strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
r
edr
i
k Kuivinen
merge-recursive: Re
p
lace 'except
:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik
K
u
ivinen
merge-
r
ecursive: Use '~' inst
e
ad of '
_
'
to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivine
n
merge-recursive: Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
Kuivinen
merge-recursiv
e
:
I
nd
e
n
t the output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fred
r
ik K
u
i
v
inen
m
erg
e
-rec
u
rsive
:
Fix support for branch names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Ku
i
vin
e
n
merge
-
recursive: Fix l
i
mi
t
ed output
of ren
a
m
e
messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
r
edrik
K
uivinen
merge-recur
s
ive: Only print rel
e
vant
rename
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
re
d
rik Kuivinen
[PATCH] Enable
and
f
ix su
p
port for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik
Kuivinen
[PA
T
C
H
] Teach git-ls-file
s
about '--' to denot
e
e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
rik
K
uivinen
[PAT
C
H] Teach t
h
e
r
e
c
ursive merge strategy a
b
out renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivi
n
e
n
[
PATCH] More descri
p
tive mess
a
ges
f
or co
n
flict
case
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kuivinen
[PATCH] recurs
i
ve-merge: Do
n
'
t
p
rint a
s
t
ack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PAT
C
H] Use the
'die' fu
n
ction w
h
ere it is appro
p
riate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Us
e
a
tempor
a
ry ind
e
x
fil
e
when we mer
g
e the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
r
ik Kuivinen
[PATCH] Adjust git-merge-re
c
ursive
.
py fo
r
the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kui
v
in
e
n
[PATCH]
Don'
t
ou
t
put 'A
u
t
o
matic merge
failed
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik K
u
ivi
n
en
[PATCH] B
e
m
o
re like the 'resol
v
e' strat
e
gy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Ku
i
vin
e
n
[
PATCH] Rename the 'f
r
edr
i
k'
merge
strategy to 'r
e
c
u
rsive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Mak
e
the
ProgramE
r
ror c
l
ass
printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vine
n
[PATCH] Make s
u
re we die if we don't get e
n
o
ugh ar
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
v
i
nen
[PAT
C
H] I
n
troduce a
'
di
e
' functi
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivi
n
en
[PATCH] Exit with status code 2 if we g
e
t an exc
e
ption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
i
vi
n
en
[PATCH] Fix
a
ssertion failure when merging
c
o
m
m
o
n ancest
o
rs
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fr
e
d
r
ik Kuivinen
[PATCH]
Make git-a
p
ply underst
a
nd incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree