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
a
mano
gitatt
r
ibutes docum
e
ntation: clari
f
y overri
d
in
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ha
m
ano
t/t
e
st-li
b
.
s
h
: Protect ourselves from comm
o
n misconf
i
gura
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
M
erg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Build RPM
w
ith
ETC_GITCO
N
FIG=/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
com
m
i
t object name as we go
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
Ham
a
no
t5302:
avoid
u
sing tail -c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C Hamano
Document
"
diff=driver" attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Hamano
Support 'diff=pgm' attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Haman
o
pack-objects: make generat
e
d
p
a
ckfile
read-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C H
a
mano
U
pd
a
te tests not to assume that genera
t
ed p
a
ckfiles
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Fix
'
quic
k
fix
'
on pa
c
k-
o
b
jects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
i
o C Haman
o
pack-obje
c
ts: quickfix for perm
i
s
sion 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 release
no
t
es for v
1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
Documentation/M
a
kefile: f
i
x section (5)
i
nstallation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update docume
n
tation
l
inks
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 Ha
m
ano
Merg
e
branch 'lt/obj
a
lloc
'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Ham
a
no
Merge bra
n
ch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
H
amano
Merg
e
branch
'
jc/attr
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
n
o
Merg
e
br
a
nch 'lt/gitlin
k
'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Ham
a
no
Merge
b
ranch
'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Merge branc
h
'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
i
o
C H
a
mano
Merge branch 'jc/quick
f
etc
h
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Ha
m
a
n
o
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
lockfile:
r
ecord the primary pro
c
ess
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io
C
Hamano
convert
.
c: restru
c
ture t
h
e
attribute checking
p
art
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C
Hamano
Fix
bogu
s
linked-list
m
anagement fo
r
user defined merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
git-clone: fix dumb proto
c
ol transpor
t
t
o clone from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Ha
m
an
o
g
i
t-
a
dd -u: match the inde
x
with working tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
Merg
e
branch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
D
ocume
n
t
gi
t
attributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
un
i
o C Hama
n
o
Update 'crlf
'
a
t
tribute sema
n
tics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
D
o
cumenta
t
ion: support manual section (5) - file
for
m
a
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Juni
o
C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C
H
a
m
ano
Simpl
i
f
y
code to fi
n
d recursive merge dr
i
ver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Haman
o
Counto-fix
i
n
m
erge-recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
Hamano
Me
r
ge
b
ra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix funny types
u
sed in attribute v
a
l
u
e
r
epr
e
sentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allo
w
low-level drive
r
to specify differe
n
t be
h
aviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Cust
o
m
l
o
w
-
l
evel me
r
ge driver: change
the c
o
n
f
iguration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Haman
o
All
o
w the d
e
f
a
ult low-level
merge d
r
i
v
er
t
o be configu
r
ed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Cust
o
m
l
o
w-level merge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'fl/cv
s
s
er
v
e
r'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Mer
g
e branch
'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Update draf
t
release notes for 1
.
5
.
2 with ac
c
umulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
Me
r
ge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Start
prepar
i
ng for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C
Hamano
Me
r
g
e branch
'
master' of git
:
//repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Merge br
a
nch 'main
t
' of git://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Merge branch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Ad
d
a demon
s
tration/tes
t
o
f
customized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Allow specifying s
p
ecial
i
zed merge-b
a
ckend
p
er path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
g
i
t-gui
:
Honor TCLTK_PATH if
su
p
p
l
ied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
m
erge-re
c
ursive: separate out xdl_merge() in
t
erface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow more t
h
an true/false
to attrib
u
t
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Make su
r
e quickfetch i
s
no
t
foo
l
ed
with a previous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
M
e
rge branch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
s
en
d
-
e
mail: do not
leav
e
an empty CC: lin
e
if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C Hamano
Cha
n
g
e
attribut
e
n
egatio
n
mark
e
r from
'
!
'
to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Defin
e
a built-in at
t
ribute macro
"b
i
na
r
y"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
a
m
an
o
attrib
u
te
m
acr
o
support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Makefile:
a
dd patch-
i
ds
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Fix
'
di
f
f' att
r
ibute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hama
n
o
Fix '
c
rl
f
' attribute seman
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Merge
g
i
t://git2
.
kernel
.
o
r
g/pu
b
/scm/gitk/
g
itk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Tea
c
h 'diff'
about 'diff' attr
i
b
u
t
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Define 'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
i
o
C
H
a
mano
Add basic infrastru
c
ture to assign attributes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Replace a pair of patch
e
s with updated ones
for sub
p
roject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
H
amano
D
o
not default to --no-inde
x
when
g
iven
t
wo directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C
Ham
a
n
o
Me
r
ge b
r
an
c
h 'j
c
/
cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
i
o
C Haman
o
Fix git
{
log,show,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documentation: --cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
git-log --cherry-pic
k
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Re
f
a
c
tor patch-id
filtering out of
git-cherry and g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
Add %m to
'--pretty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge branc
h
'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
GI
T
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Juni
o
C
H
amano
fsc
k
: do
n
ot co
m
plain on detach
e
d HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
Merge branch
'
main
t
'
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
git-fetch:
use fe
t
ch--tool pick-rref to avoid loc
a
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
git-fetch--to
o
l p
i
c
k-rre
f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
t3030: merge-recursive
b
ackend
t
est
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merg
e
-recurs
i
ve: ha
n
dle D/F conflict case more c
a
r
e
fu
l
ly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
merge-rec
u
rsive:
do
n
ot
b
arf
on "
t
o be removed"
e
nt
r
ie
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Haman
o
Tre
a
t D/
F
conf
l
i
c
t entry more carefully in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t
1
000
:
fix case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
H
a
m
ano
shortlog -w:
m
ak
e
wrap-line behaviour op
t
ional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Merge bran
c
h 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
man
o
Merge branc
h
'jc/merge-subtree
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Ha
m
ano
Merge branch 'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C H
a
ma
n
o
Merge branch
'
maint
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Documen
t
ation/cmd-list
.
mad
e
t
o
.
g
i
tignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
Start
1
.
5
.
2 cycle by
prepare
i
ng
R
elNotes f
o
r
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
no
Merge b
r
a
n
ch
'
jc/read-
t
ree-df' (early pa
r
t)
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
next