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
GIT v1.5.2-rc2
2007-05-06
Junio C Ha
m
ano
GIT
v
1
.
5
.
2-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Jun
i
o C
H
a
mano
Merge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-05-06
Junio C Hamano
A
d
d
test for blame c
o
rner cases
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Junio C Hama
n
o
bl
a
me: -C -C -C
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Junio C Haman
o
blame: Notice
a
whol
e
sale
i
nc
o
rporation of an
existing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-04
Junio C H
a
mano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-05-04
Junio C Ha
m
a
n
o
diff
.
c: fix "
s
iz
e
c
a
che" handling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-03
Junio
C
Hamano
b
lame: use
.
mailmap uncon
d
iti
o
nally
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-02
J
u
nio C Hamano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-05-02
Junio C Hamano
M
erge branch 'mai
n
t
'
of gi
t
:
/
/r
e
po
.
or
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-05-01
Junio C
H
amano
GIT
v1
.
5
.
2
-
r
c1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-01
Junio C
Hamano
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-05-01
Junio C Hamano
GIT
v1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-30
J
u
nio C Hamano
Fix symlink handling in git-svn, related to P
e
rlIO
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
H
amano
Mer
g
e bran
c
h 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-29
J
unio
C
H
a
mano
Make sure test-g
e
nrand
o
m and test-chmti
m
e are
buil
t
as
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Make macros to
p
reven
t
dou
b
le-inclusion in headers
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io C Hama
n
o
Apply mailmap in git-blame
o
utpu
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
Hamano
S
plit o
u
t
mail
m
ap
handl
i
ng o
u
t of shortlo
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C Ha
m
a
n
o
blame -s: suppress
author n
a
me and
time
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
Hamano
M
e
rge commit 'gf
i
/master'
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io
C Hamano
M
erge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2007-04-29
J
unio C
H
amano
Fix
import-tars
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
unio
C
Hamano
Upda
t
e
.
mailm
a
p
with "Mi
c
hael"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C Ha
m
ano
Do not barf
o
n too l
o
n
g
action de
s
c
r
ipti
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
Hamano
M
e
rg
e
b
r
anch 'maint' o
f
git://repo
.
or
.
cz/git
/
f
a
st
i
mport
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Junio C Hamano
M
e
r
ge branch
'maint
'
commit
|
commitdiff
|
tree
2007-04-26
Junio
C
Ha
m
ano
Merge
b
ran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-26
Ju
n
io
C Hama
n
o
Star
t
preparing f
o
r
1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Ju
n
io C H
a
m
a
no
Add --
d
at
e
=
{
local,relative,default}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C
H
a
mano
Add 'fi
l
ter' a
t
tr
i
bute and ex
t
ernal fi
l
t
e
r driver
definition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C Ham
a
no
Add 'i
d
e
n
t
'
c
onv
e
rsi
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Juni
o
C Hama
n
o
M
e
rge
b
r
anch 'jc
/
the-index'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge br
a
nch '
m
k/diff'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
M
e
r
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-25
Junio
C Hamano
M
erge branc
h
'master' of git://repo
.
or
.
c
z/git/fastimport
commit
|
commitdiff
|
tree
2007-04-24
J
unio C Hamano
a
ppl
y
m
box & quiltimport:
typofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
git
a
t
t
ributes d
o
cumentation
:
cl
a
rify overriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t/te
s
t
-
lib
.
sh: Pro
t
ect ourselves from common misconfiguration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
Di
f
f between tw
o
blobs should take mode chang
e
s
into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
i
o C
Hamano
Build R
P
M
w
ith ETC_GITCONFIG=/etc
/
gitconfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t6030: grab commit objec
t
n
ame as w
e
go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Hamano
t5302: avoid using
t
ail -
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Jun
i
o C
H
aman
o
Docu
m
ent "diff=driver
"
a
t
tribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C Hamano
Make read-c
a
c
h
e
.
c "the_in
d
ex" free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Hamano
Move
index-r
e
lated variables
i
nt
o
a
structure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Suppor
t
'dif
f
=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C
H
amano
pack-objects: make gene
r
ated packfile re
a
d
-on
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C Hamano
Update te
s
ts not to assume that generated packf
i
l
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fix 'quickfix' on pack-obj
e
c
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
pack-objects: q
u
ickfix for permissi
o
n modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
mano
Update draft rele
a
se
n
otes fo
r
v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io
C
Hamano
Documentation/M
a
k
e
f
i
l
e
:
fix section
(
5
) in
s
tallat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
am
a
no
Upda
t
e documentation links t
o
point
a
t v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
m
ano
Merge
b
r
anch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
er
g
e bran
c
h 'jc/a
d
d'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
M
erge b
r
anch 'jc/a
t
t
r'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C H
a
ma
n
o
M
e
rge
b
ranc
h
'lt/g
i
tl
i
nk
'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Merge
b
ranc
h
'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
ama
n
o
Merge
bra
n
c
h 'jp/ref
s
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
erge br
a
n
c
h 'j
c
/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
i
o
C Haman
o
GIT
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
mano
lockfile: rec
o
rd
t
h
e primary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Hamano
convert
.
c: restr
u
cture th
e
a
t
t
ribute checking
p
a
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Hamano
Fi
x
bogus linked-list
manage
m
e
n
t
f
or user defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
H
amano
git
-
clone: fix dumb protocol transp
o
rt to clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ham
a
no
git-add -u: ma
t
ch the i
n
d
e
x w
i
th working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Document gitattribut
e
s(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
U
p
date 'crlf
'
attribute
s
emantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Documentat
i
o
n: supp
o
rt manual s
e
ct
i
on (5) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Ham
a
no
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io
C Hamano
Simplify cod
e
to find rec
u
rsive merg
e
driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C
Hamano
Counto-fix
i
n
merge-
r
ecurs
i
ve
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C H
a
mano
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Haman
o
Fix
funny
types
u
sed in attribute value representation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
A
llow low-level drive
r
to specify dif
f
e
r
en
t
behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
Hamano
C
ustom low-level merg
e
d
river: change the configuratio
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Allow
t
h
e
default low
-
level
merge driver to be co
n
figured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
C
u
stom low-
l
evel
m
erge drive
r
support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Me
r
ge bra
n
ch
'
fl/c
v
sserver'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Update draft r
e
lease notes for
1
.
5
.
2 with
a
cc
u
mu
l
a
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C H
a
mano
Merg
e
b
ra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
S
ta
r
t prepar
i
ng f
o
r 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C Hamano
Merge branch 'master
'
of gi
t
://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
amano
Mer
g
e
b
ranch '
m
aint' of
g
it:/
/
repo
.
or
.
cz/git
-
gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
Merge branch 'jc/read-tr
e
e-
d
f
'
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Add a d
e
monstration/test
o
f c
u
stomized
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
llow s
p
ecif
y
ing
s
p
e
cialized
me
r
ge-backen
d
per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
git-gui: Honor TCLTK_PA
T
H if
supp
l
ied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
ni
o
C Haman
o
m
er
g
e-recurs
i
ve: separate ou
t
xdl_merge() inte
r
face
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
l
low more than true/false to a
t
tr
i
butes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make s
u
re qu
i
c
k
fetc
h
is not fool
e
d with a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C Hamano
send-
e
m
a
il: do not leave an e
m
pty CC: lin
e
if no
cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ham
a
no
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ha
m
ano
Me
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
next