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-04-24
J
u
nio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C Hamano
Build RPM with E
T
C_GITC
O
NFIG=/etc
/
gitconfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Hamano
t6030: g
r
ab co
m
mit object name a
s
we
g
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Hamano
t5302:
a
v
oid us
i
n
g
tail
-c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Jun
i
o
C
Hamano
Do
c
u
ment "d
i
ff=driver"
a
ttribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
Hamano
Make read-ca
c
he
.
c "the_index" free
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C Hamano
Move index
-
related variables into a stru
c
ture
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ham
a
no
Su
p
po
r
t
'diff=pgm' attribut
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
p
ack-objects: make g
e
ner
a
ted packfile read-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C H
a
mano
U
p
date
tests no
t
to as
s
ume t
h
at gen
e
rated packfile
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Fix 'quickfix' on pack-ob
j
ects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
p
a
ck-objects: quickfix for permissi
o
n
modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Update
draft release n
o
tes for v
1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Docum
e
ntati
o
n/Makefile:
fix
sectio
n
(5)
i
nstalla
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
H
amano
Update
d
ocument
a
tion links to point
a
t v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
b
ranch 'lt
/
objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
br
a
nch
'jc/add
'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C H
a
mano
M
erg
e
branch 'jc/
a
ttr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge br
a
n
c
h 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Merge branch
'
j
p
/refs'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hama
n
o
Mer
g
e branch 'j
c
/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C
Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Hamano
G
I
T 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
lockfile: r
e
cord
t
he pri
m
ary process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
c
o
nvert
.
c: restructure
th
e
at
t
ribut
e
c
hec
k
i
n
g
p
art
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Hamano
F
i
x
bogus linked-l
i
s
t
man
a
gement for user d
e
fined mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Hama
n
o
git-clone: fix dumb protocol t
r
anspor
t
to clone f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
gi
t
-add
-
u: matc
h
the i
n
dex with
w
o
r
kin
g
t
ree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
D
ocument gitattributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Updat
e
'crlf'
attrib
u
te semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Docu
m
entat
i
on: suppor
t
manual section (5) - file formats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
J
unio C
H
aman
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Juni
o
C
Hama
n
o
Simpl
i
fy code
to fin
d
recursiv
e
merge d
r
iver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-fix in
m
erge-re
c
ursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o C Hama
n
o
Merge br
a
nch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Fi
x
fu
n
ny typ
e
s used in attribute value representation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Ham
a
n
o
A
llow low
-
l
e
v
e
l
driver t
o
specify differen
t
b
e
ha
v
iour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
m
a
no
C
u
stom
low-le
v
el m
e
rge dr
i
v
e
r
:
c
h
a
nge the confi
g
uration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
a
ma
n
o
Allow
t
h
e default low-level merge
driver to be conf
i
g
u
red
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o C
Hamano
Custom
low-level m
e
rg
e
driver
s
upport
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Merge branch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
a
no
Merge branch
'
m
ain
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
U
p
date draft re
l
ease n
o
tes
for 1
.
5
.
2 wit
h
accumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
M
e
rge
b
ra
n
ch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Start preparin
g
f
or 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Mer
g
e branch 'mas
t
er' of g
i
t://repo
.
or
.
cz
/
gi
t
-
gui
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
H
a
m
ano
Me
r
ge
b
r
a
n
ch 'maint'
o
f
git://repo
.
or
.
c
z/git-g
u
i int
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hama
n
o
Merge
b
r
a
nch
'
jc
/
read-tree-
d
f'
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Ham
a
no
Add a demonstration/test
of cust
o
m
ized
merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
Allow spec
i
fying
s
pecialized merge-back
e
nd pe
r
pa
t
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio
C
Ham
a
n
o
g
it-gui
:
Honor TCLTK_PA
T
H i
f
s
u
pplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
merge-recursive:
s
eparate out xdl_merge()
i
n
terface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
A
ll
o
w mor
e
than t
r
ue/false to
attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Make su
r
e quickfetch is n
o
t fo
o
l
ed with a previous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
H
amano
M
e
r
g
e branch
'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
send-email: d
o
no
t
leave
an
empty CC: line if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
i
o
C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Me
r
g
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Change
attribute negation mar
k
er from '!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Defin
e
a built-in attribute mac
r
o "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
n
o
attribute m
a
cr
o
support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C Hamano
Makefile: add patch-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
Fix '
d
i
f
f'
a
ttribute
seman
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
aman
o
Fix 'cr
l
f' attr
i
bute semant
i
c
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
i
o C Ham
a
no
Mer
g
e
git:
/
/
g
it2
.
ker
n
el
.
org/pub
/
scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io
C H
a
mano
Teach 'diff' ab
o
u
t
'diff' attrib
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Defi
n
e 'crlf'
a
ttr
i
bute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C H
a
m
a
no
Add basic inf
r
as
t
ru
c
tu
r
e to assi
g
n attributes
t
o paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Merge branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
R
ep
l
ace a pai
r
of pat
c
h
e
s with upda
t
ed one
s
f
o
r
subproje
c
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C
Hamano
Do
not default to --no-in
d
ex when given two dire
c
to
r
ies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C Hamano
Me
r
ge
bran
c
h
'
jc/ch
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
H
amano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C
H
a
ma
n
o
Fi
x
git {log,show
,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
D
ocumentation: --cherry-p
i
ck
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
g
it-l
o
g --
c
herry-
p
ick
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
Refact
o
r patch-id fi
l
tering out of git-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add
%m to '--pre
t
ty
=
f
ormat:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Ha
m
a
no
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
J
u
n
io C Hamano
f
s
c
k:
d
o
not complain on deta
c
hed HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
Merge b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hama
n
o
g
it-fetch: use fetch--tool pick-rref to avoid local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio
C
Haman
o
g
it
-
f
e
tch--tool
pick-
r
ref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t3030: merge
-
recursive b
a
ckend
test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Ha
m
an
o
merge-recursive
:
handle D/F conflict case more c
a
refully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
mer
g
e-
r
ecursive
:
d
o not barf on
"to be removed"
e
ntries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
Treat D/F conflict entry more care
f
ully in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
t1000: fi
x
case ta
b
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
shortlo
g
-w:
make wrap-
l
ine behaviour op
t
ional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Merge branch 'jc/push
'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Merge
b
ranch 'jc/merg
e
-
s
ubtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
erge br
a
n
c
h
'
js/fetc
h
-
pro
g
ress'
commit
|
commitdiff
|
tree
2007-04-09
J
un
i
o C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Docu
m
enta
t
ion
/
cmd-li
s
t
.
made to
.
git
i
gnore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
St
a
rt 1
.
5
.
2 cycle by preparei
n
g Rel
N
otes
f
o
r it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merg
e
branch 'jc/read-t
r
ee-
d
f
' (ear
l
y par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
M
e
rge branc
h
'maint'
commit
|
commitdiff
|
tree
next