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
GIT 1.5.2.3
2007-04-29
Junio
C
H
amano
Merge c
o
mmit 'gfi/master'
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
Hamano
Mer
g
e branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-29
Juni
o
C
H
aman
o
Fix import-tars fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
H
am
a
no
U
p
date
.
ma
i
l
m
ap with "Micha
e
l
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Haman
o
Do
no
t
barf
o
n too long action de
s
c
r
iptio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io C Ham
a
no
Merge branch 'maint
'
of git://repo
.
or
.
cz/g
i
t/fast
i
mpor
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
J
u
nio
C
Ham
a
n
o
M
e
rge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Jun
i
o C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C
Hamano
St
a
rt prepa
r
ing for 1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
J
unio C Haman
o
Add --da
t
e={
l
ocal,rela
t
ive
,
default}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
J
unio
C
Hamano
Add 'filter'
attribut
e
and ext
e
rna
l
filter dri
v
er definition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Juni
o
C Ham
a
no
A
d
d 'ident'
c
onversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Juni
o
C Hamano
Merge branch 'jc/th
e
-ind
e
x'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
M
e
r
g
e branch 'mk/diff'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Haman
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-25
Junio C H
a
mano
Merg
e
branch 'mas
t
er'
o
f
git://repo
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
a
p
plym
b
ox
& quil
t
impor
t
: typofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C H
a
mano
gitat
t
ributes
docum
e
ntation: c
l
arify overridi
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C Ham
a
n
o
t
/
test-
l
ib
.
sh: Protect o
u
rselves from
co
m
m
on
misconfigur
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C Hamano
Diff betwee
n
tw
o
blobs should take m
o
de changes into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Build
R
PM with ETC_GITCONFIG
=
/
e
tc/gitconfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o
C
Hamano
t6030:
grab commit o
b
ject na
m
e as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Haman
o
t5302: avoid using tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Jun
i
o C Hamano
Document "diff=dri
v
er" att
r
ibute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
Make read-cache
.
c "t
h
e_i
n
de
x
" free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C Ha
m
ano
Move in
d
e
x-relat
e
d varia
b
les into a
struct
u
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
a
m
ano
Support 'diff=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Haman
o
pack-obje
c
ts: make gen
e
ra
t
ed pa
c
kfile read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C Hamano
Up
d
a
t
e
t
e
s
ts
n
ot to
assume that generated pack
f
iles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C H
a
mano
Fix 'quickf
i
x' on pack-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
pac
k
-o
b
jects: quickfix for p
e
rmissio
n
m
o
d
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Ha
m
ano
U
p
date
d
raft rele
a
se 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
Docum
e
ntation/Makefile:
fix se
c
t
i
on (5) ins
t
allation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Updat
e
documentation 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
Junio
C Hamano
Merge bran
c
h
'lt/objalloc
'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hama
n
o
Merge bran
c
h 'j
c
/ad
d
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
b
ranc
h
'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
M
e
rge branch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Merge
b
ran
c
h 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge bran
c
h '
j
p
/ref
s
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
Merge branch 'jc/quickfetch
'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o
C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
lockfi
l
e
: record t
h
e
p
rimary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
c
o
nvert
.
c: restr
u
ctu
r
e the attr
i
bute checki
n
g part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ham
a
no
Fix bo
g
u
s l
i
n
ked-li
s
t management fo
r
use
r
defined m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Ha
m
ano
git-clone
:
fix dumb proto
c
ol tr
a
nspo
r
t to clo
n
e from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
git-add
-
u: match the i
n
dex with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
unio
C
H
amano
M
e
rge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Document gitattri
b
utes
(
5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C
H
amano
Update
'
crlf' attribute
s
e
m
antics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
D
ocumentation: support manual
s
ection (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
M
e
rge b
r
anch
'
m
a
i
n
t'
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C
H
amano
Simp
l
ify code
t
o fin
d
recursi
v
e merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Co
u
nt
o
-
fix in merg
e
-r
e
c
u
rsive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ham
a
no
Merge
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Fix funny typ
e
s u
s
ed in attribut
e
value r
e
p
resentat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow low-level dr
i
v
e
r to speci
f
y
d
ifferent behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Custom
l
ow-leve
l
merg
e
driver: change the
configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
man
o
Allow the
d
efa
u
lt low-level mer
g
e
d
river to be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Custom
l
o
w
-level 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/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C H
a
m
a
no
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
Hamano
U
pdate
d
r
aft re
l
ease notes f
o
r
1
.
5
.
2 with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
S
tar
t
pr
e
paring for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C Ha
m
ano
M
erg
e
b
r
a
nch
'
master' o
f
gi
t
://repo
.
or
.
c
z/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Haman
o
Me
r
ge branch 'maint'
o
f gi
t
://
r
e
po
.
o
r
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Haman
o
Me
r
ge br
a
nch 'jc/read-tr
e
e-df'
commit
|
commitdiff
|
tree
2007-04-17
J
u
ni
o
C Hamano
Add a demonstration/t
e
st o
f
cu
s
tomized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
Allow specifyin
g
s
pecialized merge-bac
k
e
n
d per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Haman
o
g
i
t-
g
u
i
: Honor TCLT
K
_PATH if supp
l
ied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
mer
g
e-recur
s
ive: separ
a
te out xdl
_
merge
(
) interfa
c
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow more
t
han true/fa
l
s
e to attribu
t
es
.
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 foole
d
with a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch 'js
/
wrap-
l
og'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
send-email:
do not le
a
ve an empty CC: line if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
u
ni
o
C Hamano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Change attribute negatio
n
marke
r
from
'
!
'
t
o
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Define a built-
i
n
attribut
e
macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
a
t
tribute macro su
p
port
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Makefile: add pat
c
h-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Fix 'd
i
ff'
attribute semant
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Haman
o
Fix
'
crlf' attribute sem
a
ntics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
M
e
rg
e
git://git2
.
k
e
rnel
.
org
/
pub/sc
m
/gitk/gitk
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
man
o
Teach
'dif
f
' about 'di
f
f' att
r
ibute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Define 'cr
l
f' attrib
u
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C Hamano
Add
b
asic infrastru
c
tu
r
e to assign attribu
t
es
to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Ha
m
an
o
R
e
place a pair of patches with updated ones for subp
r
ojec
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C
H
amano
Do not defaul
t
to
--no-index w
h
en given two direc
t
ories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Haman
o
M
erge branch 'j
c
/cher
r
y'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Hamano
Me
r
ge
b
ra
n
c
h
'
mai
n
t'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C
Hamano
Fix git {log,show,
.
.
.
} -
-
pretty
=
email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documen
t
ation
:
--ch
e
rr
y
-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
gi
t
-
lo
g
--cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Refactor pat
c
h-id filtering out of gi
t
-
c
h
e
r
r
y
and g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
A
dd %m t
o
'
-
-p
r
etty
=
format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next