repo.or.cz
/
git
/
spearce.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
H
amano
gitat
t
r
ib
u
t
e
s
documenta
t
ion: clarify over
r
iding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
uni
o
C Hamano
t/test
-
lib
.
sh:
P
rote
c
t
ourselves from com
m
o
n misconf
i
g
uration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Mer
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
H
a
man
o
B
uild RPM wit
h
E
TC_GITCONFIG=/
e
tc/gitco
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C
H
amano
t6030: grab com
m
it obje
c
t
n
ame a
s
w
e
go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
unio C Hamano
t5302: avoid usin
g
t
ail -
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Document "diff=driver" at
t
r
ibute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
S
u
ppo
r
t 'diff=pg
m
'
a
t
tribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
pack-objects:
make gen
e
r
a
ted packfile read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Hamano
U
p
date tests not to as
s
u
me th
a
t generated pac
k
files
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fix 'qu
i
c
k
fi
x
' on p
a
ck-obj
e
cts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
un
i
o C Hamano
pack-obje
c
ts: quickfix
for permiss
i
on modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Haman
o
Upda
t
e draft rel
e
ase notes fo
r
v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Ham
a
no
Doc
u
mentation/Mak
e
file: fix sect
i
o
n (5
)
installat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Upd
a
te
d
ocumentati
o
n
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
J
u
nio C Hamano
Merge bran
c
h
'l
t
/objal
l
o
c'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
M
erge branch
'
j
c/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Ha
m
a
n
o
M
e
rge
b
ra
n
ch 'jc/at
t
r'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C H
a
mano
Merge
branch 'lt
/
gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Merg
e
b
r
a
n
ch
'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hama
n
o
M
e
rge br
a
nch
'
j
p/r
e
fs'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
H
amano
Merge
b
ran
c
h 'jc/qu
i
ckfe
t
c
h'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Ha
m
ano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Hamano
GI
T
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
a
m
ano
lockfile: record the p
r
imary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
Ha
m
a
n
o
conve
r
t
.
c: rest
r
uct
u
re the a
t
tribu
t
e
ch
e
c
k
i
ng part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
mano
Fix bogu
s
l
in
k
e
d
-li
s
t
ma
n
a
gemen
t
f
or user defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
amano
git-clone: fix
d
u
mb protocol
t
r
ansp
o
rt
to clone
from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
H
a
m
a
n
o
g
it-add -u: match the index
w
ith
w
orking tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
Document gita
t
tributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
H
amano
Upd
a
te 'c
r
lf
'
attribute
s
ema
n
t
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
Documentation: su
p
port manua
l
section (5) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
n
i
o C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify
code to find
recursive merge
d
river
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
Ha
m
ano
C
ounto-
f
i
x in
merge-r
e
cursi
v
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Ha
m
ano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C H
a
mano
F
i
x funny types used in
a
t
t
ribute value rep
r
es
e
ntation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C
Hamano
Allow
low-leve
l
d
r
iver to specify
d
iffer
e
n
t
behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C Ha
m
a
n
o
C
u
s
t
o
m
low-
l
evel merge driv
e
r:
c
ha
n
ge the c
o
nfigur
a
t
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
mano
Al
l
ow the def
a
ult low-
l
evel merge driver to be
configu
r
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hama
n
o
Cus
t
o
m
low-lev
e
l merge
driver sup
p
ort
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch
'
fl/
c
v
s
server'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
U
p
d
ate draft relea
s
e notes for 1
.
5
.
2 w
i
th accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Haman
o
S
t
art prep
a
rin
g
for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Ha
m
ano
Mer
g
e
branc
h
'master
'
of gi
t
://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C
H
a
m
ano
Merge
branch '
m
aint
'
of
gi
t
:/
/
repo
.
o
r
.
cz
/
g
i
t-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Merge
b
ranc
h
'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Ha
m
ano
Add a demonstra
t
io
n
/test of customized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ham
a
no
Allo
w
spe
c
ifying
s
pecialized merg
e
-b
a
ckend per
path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
git-gui:
Honor
TCLTK
_
PATH
i
f su
p
plied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ham
a
no
me
r
ge-recu
r
si
v
e
: separate out x
d
l_merge()
in
t
e
rfa
c
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Allow
m
o
r
e than
t
rue/false to a
t
t
r
i
butes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make su
r
e quickfetch is not
fo
o
l
ed with a previo
u
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge b
r
anch 'js/
w
rap
-
l
og'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
s
en
d
-email:
d
o not leave an empt
y
CC:
l
ine if
n
o cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
unio
C Hamano
Merge
b
ran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Chang
e
a
ttribu
t
e negat
i
o
n m
a
rker from '!
'
to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
un
i
o
C Hamano
Define a built-i
n
attribu
t
e macro
"binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
un
i
o C Hamano
attribute
m
acro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio 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
iff
'
attribut
e
semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Fix
'
crlf' attribute se
m
an
t
ics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Merge git://g
i
t2
.
ke
r
nel
.
org/
p
ub
/
scm/gitk/g
i
tk
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
i
o
C Hamano
Tea
c
h '
d
iff' about '
d
iff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Haman
o
Define 'crlf
'
attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
A
d
d basic infrastructure to assign attributes
t
o
p
aths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
Repla
c
e a
p
a
i
r
o
f
patc
h
e
s wi
t
h updat
e
d ones f
o
r subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
D
o
not
d
ef
a
ult
to --no-ind
e
x when give
n
t
w
o directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
i
o C Hamano
Merge branch '
j
c
/cherr
y
'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Fix
git {log,show,
.
.
.
}
--pret
t
y=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
uni
o
C
Ham
a
no
Documentation: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
g
i
t-lo
g
--cherry-
p
ick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
Re
f
a
ctor patch-i
d
fi
l
tering out of git-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
A
d
d %m
t
o
'--
p
retty=form
a
t:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Merg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
GIT
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Ju
n
i
o
C H
a
ma
n
o
fsck: d
o
not complain
o
n detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C
Hamano
Merge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
io C Hamano
git-fetch: use fetch-
-
tool
p
ick
-
rref to avo
i
d local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
ma
n
o
g
i
t-
f
etch-
-
too
l
pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
t3030: me
r
ge
-
recursive backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Ham
a
n
o
m
e
rge-r
e
c
ursive: handle D/F conflict
case more carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C Hamano
mer
g
e-recu
r
sive: do not
barf on "to be remov
e
d" entrie
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
a
mano
Treat D/F conflict entry more
ca
r
eful
l
y in
unp
a
ck-t
r
ees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
t
1
0
0
0: fix case
t
able
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
ama
n
o
s
hortl
o
g
-
w: make wrap-line behaviou
r
o
ptional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
M
e
rg
e
bran
c
h 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Mer
g
e
bran
c
h
'jc/mer
g
e
-
subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
M
e
rge bra
n
ch 'j
s
/fe
t
ch-pr
o
gress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Mer
g
e br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
A
d
d
Documentation/c
m
d
-
l
i
st
.
made to
.
gi
t
ignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hamano
Start 1
.
5
.
2 cycle by
prepareing R
e
lN
o
tes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
M
e
r
g
e br
a
n
c
h 'jc/read-tr
e
e-df' (early par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
next