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-25
Junio C Hamano
Me
r
ge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-25
Junio C
H
amano
Merge branch 'master' o
f
git
:
//repo
.
or
.
c
z/git/
f
asti
m
port
commit
|
commitdiff
|
tree
2007-04-24
J
u
ni
o
C
H
amano
apply
m
bo
x
& quiltimport: typofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
gitatt
r
ibutes documentation: c
l
arify
o
verridin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
i
o
C Haman
o
t/tes
t
-lib
.
s
h
: Protect oursel
v
es from com
m
on m
i
sconfi
g
uration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
Hamano
Merge bra
n
ch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Buil
d
RPM with ETC_GI
T
C
ONFIG
=
/etc/gitconfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t6030
:
grab c
o
mmit obj
e
ct name as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t5302: avoid using
t
a
il -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Haman
o
Document "diff=d
r
iver
"
attri
b
ute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C H
a
mano
Support 'dif
f
=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C Hamano
pack-
o
bjects: mak
e
generated pac
k
fi
l
e read
-
only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Ham
a
no
Upd
a
te tests n
o
t to ass
u
me that g
e
n
e
rated pac
k
f
iles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
no
Fix 'quickfix' o
n
p
ack
-
obj
e
cts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
p
a
c
k-o
b
jects: quick
f
ix for pe
r
mis
s
ion modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Update draft relea
s
e n
o
tes for v
1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Docum
e
ntation/
M
akefile: fix section (5) i
n
s
tall
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Update docum
e
nta
t
i
o
n links
t
o po
i
nt at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C H
a
mano
Me
r
ge branch 'lt/o
b
ja
l
loc
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
m
an
o
M
e
rge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C H
a
m
a
no
M
erge branch 'j
c
/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
Merge branch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge b
r
anch
'
np/pack'
commit
|
commitdiff
|
tree
2007-04-22
J
u
ni
o
C Hamano
Merge b
r
anch '
j
p/refs'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge
branch 'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
i
o
C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C
H
amano
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: record the
p
rimary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
convert
.
c
: r
e
structure the attribute
checking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
Fix b
o
gus linked
-
list managemen
t
f
o
r user d
e
fined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hama
n
o
git-clone: fix
dumb pro
t
ocol t
r
a
n
s
p
o
rt to clone fr
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
git-add -u
:
match the index with wor
k
i
ng tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Document gitattr
i
butes
(
5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Up
d
ate 'crlf' attr
i
bute
semant
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Hamano
Do
c
umen
t
ation: su
p
port
m
anua
l
section
(
5) -
f
ile for
m
ats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
Hamano
Simp
l
ify code to find r
e
cursive merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
unio C Hamano
Coun
t
o-fix
i
n merge-recu
r
sive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Fix fun
n
y
t
y
p
e
s used
i
n
a
ttr
i
bute value rep
r
esen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Allow low
-
leve
l
dri
v
er to
s
peci
f
y different b
e
ha
v
i
our
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
C
usto
m
low-
l
ev
e
l me
r
ge d
r
iv
e
r:
c
hange
t
he configur
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hama
n
o
Allow the default low-le
v
el merge dr
i
ver to be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-le
v
el merge driver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C Hamano
Me
r
ge bra
n
ch '
f
l/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
M
e
r
g
e
b
ranc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Ham
a
no
Update draft rel
e
ase notes for 1
.
5
.
2 with
a
ccu
m
ula
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
a
mano
Star
t
prepari
n
g
fo
r
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merge branch 'master' of git://repo
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Me
r
g
e
branch
'
mai
n
t' of git://repo
.
o
r
.
cz/g
i
t
-g
u
i into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Merge br
a
nch
'jc/read-
t
ree-df'
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Haman
o
Add a demons
t
ration/
t
est of
c
ustomized merg
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
Allow spe
c
ifying spe
c
ia
l
ized me
r
ge-backend
per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
git-g
u
i: Hon
o
r TCLTK
_
P
A
T
H
if supp
l
ied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o
C Hamano
m
e
r
g
e
-rec
u
rsive: separate out xdl_merg
e
() interf
a
ce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o
C
Hama
n
o
Allow
more than true
/
false to attribut
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
Make
s
ure
quick
f
etch is not foole
d
with a previ
o
u
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C H
a
mano
Merge branch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Hamano
s
end-email: do n
o
t le
a
ve a
n
emp
t
y C
C
: line
i
f
no
c
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge b
r
a
nch 'maint
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hama
n
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
io C Hamano
Ch
a
nge attribute
n
egation marker from '!
'
t
o
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio
C Hamano
Define
a b
u
il
t
-
i
n attribut
e
macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C H
a
m
a
no
attribute ma
c
ro 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 Hamano
Fix 'diff' attr
i
b
u
te semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
F
ix
'crlf
'
attribute sema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C H
a
m
a
no
M
e
r
g
e git://git2
.
kernel
.
o
r
g/p
u
b/
s
cm/git
k
/gitk
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teac
h
'
d
if
f
'
abo
u
t 'diff' a
t
tr
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
n
o
De
f
ine 'crlf' attr
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Add basic infras
t
ructure t
o
a
ss
i
gn attributes
t
o
paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Haman
o
Replace
a pair of pat
c
hes with
updated ones for subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Ha
m
ano
Do
not defau
l
t
to -
-
n
o
-index when given two director
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C
H
a
m
ano
Merge branch
'
j
c
/ch
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C H
a
mano
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Haman
o
Fix git {
l
og,show,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
a
m
ano
Do
c
u
m
ent
a
tion: --c
h
erry-pic
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Ha
m
ano
git-log --cherr
y
-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
R
e
factor pa
t
ch-id
fil
t
ering out of git
-
cherry a
n
d git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
uni
o
C Ham
a
n
o
Add %m t
o
'
-
-pretty=form
a
t:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ha
m
ano
Mer
g
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
GI
T
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
J
u
nio C Hama
n
o
f
sck: do not com
p
lain on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C Hamano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ham
a
no
git-fetch: use fetc
h
--to
o
l
p
i
c
k
-
rref to a
v
oid local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-fetch--tool pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
i
o C Hamano
t3030: m
e
r
ge-recu
r
sive backend
t
e
st
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Ha
m
ano
merge-re
c
ursive: handl
e
D/F conflict
c
ase more c
a
r
e
fully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
Hamano
m
erge-recursive:
do
n
o
t
barf on "to be removed"
en
t
ries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
Tr
e
at D/F conflict
e
ntry m
o
re
care
f
ully
i
n unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
t1000
:
f
i
x
case tabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
shortlog
-
w
:
make wr
a
p-l
i
ne b
e
havio
u
r
optiona
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o
C Hamano
Merge branch 'jc/
p
ush'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io
C Hamano
Merge branc
h
'jc/merg
e
-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C H
a
m
an
o
M
e
rge
b
ranch 'js/
f
etch
-
progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
a
m
ano
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
A
d
d
Documentation/cmd-list
.
ma
d
e to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next