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-04-27
Junio C H
a
m
ano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-26
Ju
n
io C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Star
t
preparing for 1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Junio
C
Ham
a
no
Add --date={local
,
rela
t
ive,defaul
t
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch 'jc
/
the-index'
commit
|
commitdiff
|
tree
2007-04-25
Junio C
H
amano
Mer
g
e branch 'mk/diff'
commit
|
commitdiff
|
tree
2007-04-25
Junio
C
Hamano
M
erge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-25
Juni
o
C Hamano
M
erge
branch '
m
as
t
e
r' of
git
:
//re
p
o
.
or
.
cz/git/f
a
stimport
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Haman
o
applymbox &
q
u
i
l
t
i
m
port: t
y
pofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Hamano
gitattri
b
utes documentation
:
clarif
y
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: P
r
otect ourse
l
ves
f
ro
m
co
m
m
on misconfigur
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Ha
m
ano
Di
f
f
b
etw
e
en two bl
o
bs should take mode cha
n
ges
i
nto
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
un
i
o
C Hamano
Merge branch
'
m
a
i
nt
'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
B
u
i
l
d RP
M
with ETC_GI
T
CONFI
G
=
/et
c
/gitco
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
t6030: grab commit object nam
e
as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t5302: avoid using tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C Hamano
D
o
cument "diff=dri
v
er" a
t
tri
b
ute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C H
a
man
o
Make
r
ead-cache
.
c
"the_ind
e
x
"
fre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C H
a
m
ano
Move index-related v
a
riables into a str
u
ct
u
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Suppo
r
t 'diff=pgm' att
r
i
b
u
te
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
i
o
C H
a
m
a
no
pack-obje
c
ts: make generated packfi
l
e read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Update te
s
t
s not to assu
m
e that generated packfile
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fix
'quickfix'
on pack
-
ob
j
ects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C H
a
mano
pack-obje
c
ts: quickfix for permis
s
ion modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
U
p
dat
e
dr
a
f
t
r
e
le
a
s
e
notes for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Documentation/Makefile:
f
i
x
se
c
tion (5) installation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hama
n
o
Update documen
t
ation
link
s
to poi
n
t a
t
v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Ha
m
ano
Me
r
ge br
a
n
c
h
'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C H
a
man
o
Merge b
r
an
c
h 'jc
/
add'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Haman
o
Merge
b
r
a
nch 'jc/
a
ttr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Merge branch
'lt/git
l
ink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
a
n
o
M
erge
branch 'jp/refs
'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio
C
Haman
o
Mer
g
e branch '
j
c
/
qu
i
ckfetc
h
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge bra
n
ch
'
maint'
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 Hama
n
o
lo
c
kfi
l
e: record the primary pro
c
ess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Hamano
c
onvert
.
c:
restru
c
ture
t
he attribute check
i
ng part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
mano
Fix bogus linked-list managem
e
nt for use
r
defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
g
it-clone: fix dumb
p
ro
t
ocol transport to clo
n
e
f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Haman
o
g
it
-
a
d
d -
u
: match the inde
x
wit
h
working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C Ham
a
no
Merge branch '
m
aint
'
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Haman
o
Document
gitattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
Update 'crlf' attribute
semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io
C
Hamano
Do
c
u
m
enta
t
ion: suppor
t
manual sectio
n
(5) -
file f
o
rmats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-19
J
unio C Hamano
Simplify
code
t
o find recursive mer
g
e driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
un
i
o
C
Hamano
Co
u
nto-
f
ix
in merg
e
-r
e
cu
r
sive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Me
r
ge
branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Fix funny types used i
n
a
ttribut
e
value repres
e
ntat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C
H
amano
Allow
low-level driver
t
o
specif
y
di
f
ferent behavi
o
ur
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Cu
s
tom
low-l
e
vel merge
d
r
iver
:
ch
a
nge the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow the
d
e
f
aul
t
low-level
merg
e
driver to be configu
r
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o C
H
a
m
a
no
Cus
t
om low-level merge dri
v
er s
u
pport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Merge branch 'fl/cv
s
server'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
man
o
Update draft
release notes for 1
.
5
.
2
w
ith accumulat
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Star
t
preparing f
o
r
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
e
r
ge
b
ranch
'mast
e
r' of
git:
/
/r
e
po
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
M
e
r
g
e branch 'm
a
i
nt' of
g
it://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Merge branch 'jc/r
e
a
d-tr
e
e-df'
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
io C Hama
n
o
A
d
d
a
d
e
mons
t
ration/tes
t
of cu
s
tomized
merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow sp
e
cifying
specialized merge-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
i
o C
H
a
m
a
no
git
-
g
u
i:
H
onor TCLTK
_
P
A
TH if su
p
plie
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-recursive: separate out xd
l
_merge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow mor
e
t
h
an
t
ru
e
/false t
o
at
t
ributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
Make sure q
u
ic
k
f
etch is not foole
d
w
it
h
a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C Hama
n
o
Merge br
a
nch
'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C
H
am
a
n
o
s
e
n
d-email: do
not leave
a
n
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
g
e b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ham
a
no
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C Hamano
Change attr
i
bute
n
egat
i
on marker f
r
o
m
'!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C Haman
o
D
e
fine
a
built-in
a
ttribute macro "
b
inary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
H
am
a
no
attrib
u
te macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C
H
amano
M
a
kefile
:
a
d
d patch-ids
.
h
back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'diff' at
t
ribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
n
o
Fix '
c
rlf' attribute se
m
antics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Mer
g
e
g
i
t://
g
it2
.
kernel
.
or
g
/pub/
s
cm/gitk/gitk in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
ma
n
o
Teach 'diff' about 'di
f
f' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Hamano
Define 'crlf'
a
t
t
r
ibute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add ba
s
ic infr
a
structure t
o
assign attributes
to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
Merg
e
bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Repla
c
e
a pair of
pa
t
c
he
s
with
updated o
n
es
f
o
r subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Do not
d
efault t
o
--no-
i
ndex when gi
v
e
n two
d
irectorie
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Haman
o
Merge branch 'jc/c
h
erry'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C H
a
m
ano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Hamano
Fix g
i
t {log,
s
how
,
.
.
.
} --pre
t
ty=em
a
il
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
i
o C Hamano
Documentation: --cherr
y
-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-lo
g
--cherry-
p
ick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor patch-id filtering out of git-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
Add %m t
o
'--pretty=fo
r
ma
t
:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
m
ano
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
fsck: do not complain on de
t
ached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Ha
m
an
o
M
e
r
g
e branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
g
i
t-fetch: use fetch-
-
too
l
pic
k
-rref to
a
void local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
g
it-fetch--tool pick
-
rr
e
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
t
3
030: merge-recursive backe
n
d tes
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io
C
Hamano
mer
g
e-recu
r
sive: handle
D/F conf
l
ict c
a
se more
c
aref
u
lly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next