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 'maint'
2007-05-06
Junio C Hamano
Me
r
g
e branch
'maint'
commit
|
commitdiff
|
tree
2007-05-06
Jun
i
o C Hamano
Add test for b
l
a
m
e corner cas
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Ju
n
io C Hamano
blame: -C
-
C
-C
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Junio C
H
a
mano
blame: Notice a wholes
a
le incorp
o
ration of an exi
s
ting
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-04
J
u
n
i
o
C Hamano
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2007-05-04
Junio C
Hama
n
o
diff
.
c: fix "size cac
h
e" handling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-03
J
u
n
i
o C Hamano
bl
a
me: use
.
mai
l
m
a
p unconditionally
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-02
Junio C Hamano
Merge bra
n
ch
'
maint
'
commit
|
commitdiff
|
tree
2007-05-02
J
un
i
o C Hamano
Merge b
r
a
nc
h
'ma
i
nt' of g
i
t
://
r
epo
.
or
.
c
z/git/fasti
m
p
o
r
t
.
.
.
commit
|
commitdiff
|
tree
2007-05-01
Jun
i
o C Hamano
GIT
v
1
.
5
.
2
-
rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-01
Ju
n
io C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-05-01
J
u
nio
C
Ham
a
no
GIT v1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-30
Junio
C
Haman
o
Fix
syml
i
nk handling in git-svn
,
r
e
l
a
ted to
P
erl
I
O
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Jun
i
o C Hamano
Merge
b
ranch 'j
c
/att
r
'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Make sure te
s
t-g
e
n
random and
t
est-chm
t
ime are
built
a
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io
C Ha
m
an
o
M
a
ke
macros to preve
n
t
doub
l
e-inclusio
n
in headers
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
Hamano
Appl
y
mailmap in git-b
l
ame output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Spli
t
o
ut mailmap
handling out of
shortlog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Ha
m
ano
blame -s: suppress author name
a
n
d
t
i
me
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
H
amano
Merge
c
omm
i
t
'
g
f
i/master'
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
i
o
C
Ha
m
an
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io C Hamano
Fix
import-t
a
rs fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Juni
o
C
Hamano
U
pdate
.
mailmap with "Mich
a
el"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Do not barf on too lo
n
g a
c
tion des
c
r
i
p
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Ha
m
ano
Merge
branch 'maint' of git://repo
.
or
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Junio C H
a
man
o
Merge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-26
Junio
C
Hamano
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-26
Junio
C H
a
mano
St
a
rt preparin
g
for 1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Junio C H
a
mano
Ad
d
--d
a
t
e={local,relative,default
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
A
dd 'filter
'
attrib
u
te
a
nd
e
xternal filter driver de
f
initio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Haman
o
Add
'
i
d
e
nt' conversi
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge
b
r
an
c
h 'jc/the-in
d
e
x'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge br
a
nch
'mk/diff'
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C Hamano
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch '
m
aster' of git://repo
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C H
a
mano
a
p
plymbox
&
qui
l
tim
p
ort: typ
o
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
n
o
git
a
ttributes documentati
o
n: cla
r
ify overriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Hamano
t/tes
t
-lib
.
sh: Protect ourselves from common mi
s
confi
g
urati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Diff
b
etween
two b
l
ob
s
should
take
m
od
e
changes into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
n
io C
H
amano
M
e
rge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
Buil
d
RPM with ETC_GITCONFIG=/etc/git
c
o
nfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
t6030
:
grab c
o
mmit o
b
j
e
ct name as
we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
unio C Hamano
t53
0
2
: avoid using
t
a
il -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
i
o
C Hamano
Document
"
diff=driver" at
t
ribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
H
a
m
a
no
Make
r
ead-cache
.
c
"
the_
i
ndex" free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio
C
H
amano
M
o
ve index-related
variables into a structure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
Hamano
Support 'diff=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Hamano
p
ack-objects: make gene
r
ated pa
c
kfile read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C Hamano
Up
d
ate te
s
ts not to assume that genera
t
ed packf
i
les
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
Fix 'quickfix
'
on pack-objec
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
ni
o
C Haman
o
pack-objec
t
s: quickfix
f
or pe
r
mi
s
sion
modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
mano
Update
d
r
aft rele
a
se not
e
s for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
D
o
cume
n
tation/Mak
e
file: fi
x
section (5) installati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C H
a
ma
n
o
U
pdate documentation links to poi
n
t at
v
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Merge bran
c
h 'l
t
/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
Hamano
Merge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Merge
b
ranch
'
jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Me
r
ge b
r
anch 'l
t
/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio
C H
a
m
a
no
Mer
g
e
branch 'np/p
a
c
k'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
erge b
r
anch 'jp/ref
s
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
Merge branch
'jc/quick
f
et
c
h
'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
M
e
rge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ham
a
no
G
I
T 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Hama
n
o
lockfi
l
e: record the primary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hamano
conve
r
t
.
c: restructure the at
t
ri
b
ute checking
part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
Fix bogus linked-list management for user def
i
ned me
r
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
ano
git-clone: fix dumb pr
o
tocol transpor
t
to cl
o
ne from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
git-ad
d
-u:
m
atch
the index with wo
r
king tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
M
e
r
ge
b
ranch
'maint'
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Hamano
Document gitattributes
(
5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
Update 'crlf' attribute seman
t
ic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Docume
n
tation: supp
o
rt
m
a
nual section (5) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Si
m
plify c
o
de t
o
find recurs
i
ve
m
erge driv
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C Hamano
C
o
unto-fix in merge
-
r
ec
u
rsive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Ha
m
ano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
F
ix funny ty
p
es
used in a
t
tribute
v
a
lue
repr
e
sentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hama
n
o
Allow low-leve
l
driver to specify different b
e
havio
u
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ha
m
a
n
o
Cu
s
to
m
low-level merg
e
d
r
iver: chang
e
the config
u
ra
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Ham
a
no
Al
l
ow the defaul
t
low-level merge driver to b
e
config
u
red
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ham
a
no
C
u
stom low-
l
evel
m
erge
driver s
u
pport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hama
n
o
Merge branch 'f
l
/
cvsserve
r
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
amano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Upd
a
te draft re
l
ease note
s
fo
r
1
.
5
.
2 with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Mer
g
e branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Start prep
a
ring for
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Ha
m
ano
Merge branc
h
'master'
o
f git://repo
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Ham
a
n
o
Merge b
r
anc
h
'main
t
'
o
f git
:
//repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C
Ham
a
no
Merge
b
r
anch 'jc/read-
t
ree
-
d
f
'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a demonstrat
i
on/test of customized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
l
low
s
pec
i
f
y
ing spe
c
ialized merge-
b
ackend per
p
ath
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
git-
g
ui: Honor TCLT
K
_
PAT
H
if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Ham
a
no
m
erge-r
e
cu
r
sive: separate
o
ut xdl_m
e
rge()
interf
a
ce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Al
l
ow more than
true/false t
o
att
r
ibutes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
Make s
u
r
e
quickfetch is not fo
o
led w
i
th a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Hamano
Merge branch 'js/w
r
ap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Hamano
send-ema
i
l
:
do not leave an
e
mpty CC: line if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Me
r
ge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
M
e
rge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Change attrib
u
te negatio
n
m
a
rker
f
ro
m
'!' to '
-
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next