repo.or.cz
/
git
/
jrn.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-02
J
u
ni
o
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-05-02
Junio C
H
amano
Merge branch 'main
t
' of git://repo
.
or
.
cz/gi
t
/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-05-01
Junio C H
a
mano
GIT v1
.
5
.
2-rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-01
Junio
C
Ha
m
ano
M
e
r
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-05-01
J
unio C Hamano
GIT v1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-30
Junio
C
Hamano
Fix
s
y
mlink
h
a
n
dling in git-svn, relate
d
to PerlIO
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C Hamano
Merg
e
bran
c
h 'jc/a
t
t
r'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Make su
r
e test-ge
n
ran
d
om a
n
d test-chmtime are builtas
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Ham
a
no
Make
mac
r
os to prevent doub
l
e-i
n
clusion i
n
h
e
a
de
r
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C Hamano
A
p
p
ly mailma
p
in git-bl
a
me output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Jun
i
o
C Ham
a
no
Split out mailmap handling out of
s
ho
r
tl
o
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
H
amano
blame -s: supp
r
ess autho
r
name and
tim
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io C Hamano
Merge com
m
it '
g
f
i/master'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C H
a
mano
F
ix
import-ta
r
s
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Update
.
mailmap
w
ith "Michael"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C H
a
mano
Do
n
ot
b
arf on to
o
long action
descrip
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C Haman
o
M
erge bra
n
ch 'maint'
o
f git:/
/
repo
.
or
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Junio
C
Haman
o
M
e
r
g
e bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2007-04-26
J
u
nio C Haman
o
Merg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C
Haman
o
Start preparing for 1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Juni
o
C Haman
o
A
d
d --date={local,rela
t
ive,de
f
aul
t
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
J
unio
C
Hamano
Ad
d
'filter' attri
b
ute and external fi
l
ter driv
e
r definition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Jun
i
o C Hamano
A
dd 'ident'
c
o
n
v
ersion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch 'jc/the-
i
ndex'
commit
|
commitdiff
|
tree
2007-04-25
J
unio C Hama
n
o
Mer
g
e branch 'mk/diff'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Mer
g
e branch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-25
Junio
C
Hamano
Merge
b
ranch 'master'
o
f gi
t
://repo
.
or
.
cz/git/fastimpo
r
t
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Hamano
applymbox & qu
i
lti
m
port: typ
o
fi
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
git
a
ttribut
e
s doc
u
menta
t
ion: clarify overriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
t/tes
t
-lib
.
s
h
:
P
r
o
tec
t
o
u
rselves from
c
omm
o
n
m
iscon
f
iguration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Di
f
f
b
e
tween tw
o
blobs sh
o
uld take mode
changes into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
B
u
i
l
d
RPM with ETC
_
GITCONFIG
=
/
e
tc/g
i
tco
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C Haman
o
t6030:
g
rab c
o
mmit object name a
s
we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
uni
o
C
Hama
n
o
t5302: avoid u
s
ing t
a
il
-c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio
C Hamano
Document "diff=drive
r
" attr
i
bu
t
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hama
n
o
M
ake
read-
c
ache
.
c "th
e
_
index" free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
ni
o
C Hamano
M
o
ve i
n
dex-related variables
into a
s
tructure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ham
a
no
Support '
d
iff=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
n
io C Hamano
pack
-
obj
e
cts: make
g
enerated packfile read-on
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Hamano
Update tests not to
assume that
generate
d
packfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Fix
'quickfix' on pack-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
p
ack-obj
e
ct
s
: quickfix f
o
r permission m
o
des
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
H
a
mano
U
p
date draft releas
e
notes for
v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Docum
e
ntation/Makefile: fix se
c
tio
n
(5) inst
a
lla
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
U
p
date
d
o
cumentation
l
inks to point a
t
v
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Me
r
ge branch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
branch 'jc/ad
d
'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
M
erge bran
c
h '
j
c/attr'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
i
o
C
Ha
m
ano
Merge branch '
l
t
/
gitlink'
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
io C Hamano
Merg
e
branch '
n
p/
p
ack'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C H
a
mano
Merge branch
'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Merge bra
n
ch 'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Ha
m
ano
Merge b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
lockfile: re
c
ord
the prima
r
y process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
am
a
no
conver
t
.
c: r
e
st
r
ucture t
h
e
a
t
trib
u
te check
i
ng part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
m
ano
Fi
x
bogus linked-list manag
e
m
ent f
o
r user defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Hamano
git-clone:
f
i
x
dumb protocol trans
p
or
t
t
o clon
e
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
H
amano
git-
a
d
d
-
u
:
m
atch the index with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C
Ham
a
no
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
Doc
u
ment gitatt
r
ibutes(
5
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
Update 'crlf'
a
tt
r
ibute
s
ema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io
C Ha
m
an
o
Documentation: s
u
pp
o
rt manua
l
se
c
t
i
on (
5
) - file
f
or
m
ats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C Haman
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Ha
m
ano
Simplify code t
o
find recursiv
e
merge driv
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Hamano
C
ounto-fix in merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Merg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
F
i
x f
u
n
n
y types used in attribute value represent
a
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Ha
m
ano
A
l
low low-level d
r
iver
t
o specify different
b
ehaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Custom low
-
leve
l
mer
g
e driv
e
r: c
h
ange the c
o
nfigura
t
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
A
llow the
d
efault low-level
merge driver
t
o be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Custom low-level mer
g
e
d
river
s
up
p
ort
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Mer
g
e
branch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Update d
r
aft
r
elease
notes for 1
.
5
.
2 with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
St
a
r
t prepar
i
ng for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'ma
s
ter' of git://repo
.
o
r
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Merge branch
'
maint' of git://r
e
po
.
or
.
cz/
g
i
t
-
g
u
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Mer
g
e br
a
n
c
h 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Add a demons
t
rati
o
n/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 specifying specialized
merge-backend pe
r
p
ath
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
gi
t
-gui: Honor TCLTK_PATH if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Ham
a
no
m
e
rge-recursiv
e
: separate out xdl_merge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow more than true/fal
s
e to
a
t
t
ributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Make sure qui
c
kfetc
h
i
s not foo
l
ed
with a
p
revious
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Hamano
Merge branch 'js/
w
rap-
l
o
g
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
send-email:
do not l
e
a
v
e an empty CC: line
i
f no
c
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Me
r
ge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ham
a
no
Me
r
g
e
bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Chang
e
attribute negat
i
o
n marker from '
!
' to
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Define a b
u
ilt-in att
r
ibute
macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
attribute
m
a
c
ro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C
Hamano
Makefile: add patch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C
H
ama
n
o
Fix
'diff' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hama
n
o
Fix 'crlf' attri
b
u
te seman
t
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Merge
git://
g
it2
.
k
ernel
.
org/
p
u
b/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Teach 'di
f
f' abou
t
'dif
f
'
a
ttribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next