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
gitattributes documentation: clarify overriding
2007-04-24
Junio C Hamano
g
i
tat
t
ribu
t
es documentation: clari
f
y
overriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
no
t/t
e
st-lib
.
s
h: Protect oursel
v
e
s
from
commo
n
misconfigurat
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C Hamano
Merg
e
branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-24
J
unio C Hamano
Build RPM
w
i
t
h ETC
_
GITCON
F
IG=/etc/gitconfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C
Hamano
t6030
:
grab commit object name as
w
e go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ha
m
ano
t
5302: avoid using tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C
H
amano
D
o
c
u
m
ent "diff=driver" attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Haman
o
Su
p
port 'di
f
f=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hama
n
o
pack-
o
b
j
ects: m
a
ke
generated
pac
k
file re
a
d-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
U
p
dat
e
te
s
ts
n
ot
to assume t
h
at generated p
a
ckfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fix '
q
uickfix' on
pack-o
b
j
ects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
ni
o
C Hamano
pack-object
s
:
q
uickfix for p
e
rmis
s
i
o
n
m
odes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Up
d
a
t
e
draft release notes for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io
C
Ha
m
ano
Documentation/Makefi
l
e: fix
s
ecti
o
n (5
)
installa
t
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Ha
m
a
no
Updat
e
documentation links to p
o
int at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'lt/obja
l
loc'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C H
a
m
ano
Merge
b
ranch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
Hamano
Mer
g
e
branch 'jc/attr
'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Merge bran
c
h
'
lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C H
a
ma
n
o
M
e
rge
branch '
n
p/
p
ack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Merge branch
'
jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
m
a
n
o
Merge branch 'jc/quickfe
t
ch'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Ha
m
a
n
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
a
m
ano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Ham
a
n
o
l
o
ckfile: record the primary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
c
o
nvert
.
c: rest
r
u
cture the attri
b
u
te c
h
eckin
g
part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
Fix
bogu
s
l
inked-list mana
g
ement for use
r
defi
n
ed merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hama
n
o
gi
t
-
c
l
o
ne:
f
ix dumb proto
c
o
l tran
s
port to
c
lone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio
C
Hamano
git-ad
d
-u:
m
a
tc
h
t
h
e
i
nd
e
x wi
t
h working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Merge
branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2007-04-20
J
u
n
io C H
a
man
o
Doc
u
men
t
git
a
ttri
b
utes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
Update
'
crlf' at
t
ribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Haman
o
Documentation
:
supp
o
rt manual s
e
c
tion (5) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify
code to find
r
e
c
urs
i
ve
merge d
r
i
v
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C Hamano
Counto-fix in merge-re
c
ursiv
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hama
n
o
Fix fu
n
n
y
t
yp
e
s used in attribu
t
e value r
e
pr
e
sentati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow low
-
leve
l
dri
v
er to specify d
i
fferent beh
a
viour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Custom low-le
v
el m
e
rge dri
v
er
:
change th
e
configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Ham
a
n
o
Allow
t
he default
l
ow-
l
evel merge driver
to be co
n
figured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Custom low-
l
e
vel
m
erge
d
river s
u
pport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
Hamano
Mer
g
e br
a
nch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
Hama
n
o
Upd
a
te draft release notes f
o
r 1
.
5
.
2 w
i
th accum
u
lated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C
Haman
o
Mer
g
e b
r
anch
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
S
t
art
p
reparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'maste
r
' of git
:
//repo
.
o
r
.
cz/
g
i
t
-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'main
t
'
of g
i
t://repo
.
o
r
.
cz/gi
t
-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Merge branc
h
'jc/r
e
ad-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
m
a
no
Ad
d
a de
m
onstration/test
o
f cus
t
o
m
ized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
man
o
Allow s
p
ec
i
fying spe
c
i
alized merge-backend
p
er pat
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hama
n
o
g
it-gui: Hon
o
r TC
L
TK_PATH if suppl
i
e
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o
C Haman
o
merge-recu
r
sive: sepa
r
a
t
e ou
t
xd
l
_
merge() int
e
r
f
ace
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Allow more than
t
r
ue/false to
attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
M
ake su
r
e
quickfetch is
not
fooled with
a
prev
i
ous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C Haman
o
Merge branch 'js/
w
rap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Hamano
s
end-email:
do not leave
a
n em
p
ty C
C
: line i
f
no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Hamano
Mer
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-15
J
unio C
H
amano
Chang
e
attribute negation marker fr
o
m '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
Define a built-in attr
i
but
e
mac
r
o "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribu
t
e macro su
p
port
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio
C
Ha
m
ano
Ma
k
efile: add p
a
tc
h
-ids
.
h
b
ack in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Ha
m
ano
F
ix 'diff' attribute semant
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fi
x
'crlf'
a
tt
r
i
bute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Merge git://git2
.
ker
n
el
.
org/pub/s
c
m/gi
t
k/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach
'
d
iff' ab
o
ut 'dif
f
'
a
ttribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C
H
amano
De
f
ine 'crl
f
'
a
ttribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hama
n
o
Add basic infr
a
structure to
a
s
sign attribu
t
es
to
p
a
ths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
ni
o
C Ha
m
a
n
o
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Replace a pair o
f
pat
c
hes w
i
th updated
o
nes for subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Do not
d
efault to --no-in
d
ex when g
i
ven tw
o
d
i
rectories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C
H
amano
M
erge
branch 'jc/cher
r
y'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Haman
o
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
Hamano
Fix
git {log
,
sho
w
,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Doc
u
m
e
ntation
:
--
c
herry-p
i
ck
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log --che
r
ry-pick
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
R
efactor patch-id
filte
r
ing out of gi
t
-cherry
a
nd git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
Add %m to '--pr
e
tty=forma
t
:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
am
a
no
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
GIT
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Juni
o
C Ha
m
ano
f
s
ck: do
n
ot co
m
plain on
d
etached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
i
o
C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
J
unio C H
a
ma
n
o
gi
t
-fetch: u
s
e fetch
-
-tool pick-rref to avoid l
o
cal
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-fetch--
t
ool pick-r
r
ef
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
i
o
C
H
a
mano
t
3030:
m
erge-recursive
b
ac
k
end t
e
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
m
erge-recursive: ha
n
dle D/F c
o
nf
l
ict
c
as
e
more ca
r
efully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
merge
-
recursive
:
d
o
not barf
on "to
b
e
remov
e
d
"
entr
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
H
amano
T
r
eat D/
F
conflict entry mo
r
e
c
arefully
i
n un
p
ac
k
-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hama
n
o
t1
0
00: fix case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
sho
r
tlog -w: make w
r
a
p-line behavi
o
ur opt
i
onal
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Ham
a
no
Merge bran
c
h 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
Mer
g
e branch 'jc/merge-sub
t
ree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C H
a
mano
Merge
branch
'js/fe
t
ch-progre
s
s'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
n
o
M
e
rge
bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
io C Hamano
Add Documentation/cmd
-
lis
t
.
made to
.
gitigno
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hama
n
o
S
t
art 1
.
5
.
2
c
ycle by prepareing RelNotes for
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Me
r
ge branch 'jc/read-tree-df'
(early
part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
M
e
rg
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
next