repo.or.cz
/
git
/
fastimport.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/attr'
2007-04-29
Junio C Hama
n
o
Merge branch
'
j
c/
a
ttr'
commit
|
commitdiff
|
tree
2007-04-29
Junio C
H
am
a
no
Make sure
t
est-genrandom
a
nd test-chmtime
a
re builtas
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Juni
o
C
Hamano
Ma
k
e macros to preven
t
double-inclusion in headers
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Apply mailmap in git-b
l
a
me output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C H
a
m
a
no
Split ou
t
mailmap handli
n
g out
of shortlog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C Hamano
bl
a
me -s:
s
u
ppres
s
a
uthor name
and time
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
Hama
n
o
Merge commit
'
gfi/m
a
ster'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Fix
import-tars
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Update
.
ma
i
lmap
w
ith "
M
ichael
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io C
H
amano
Do
n
ot ba
r
f on too long
a
ction de
s
c
r
iption
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
unio C Haman
o
M
e
r
g
e
br
a
nc
h
'main
t
' of
g
i
t://r
e
po
.
o
r
.
cz/
g
it
/
fasti
m
port
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Jun
i
o C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Haman
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
J
unio C Ha
m
a
no
Start
p
reparing for 1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Junio C H
a
mano
A
dd
-
-
d
ate={local,relative
,
def
a
ult}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Juni
o
C Hamano
A
dd 'fi
l
t
er' attr
i
b
ute an
d
exter
n
al f
i
lter driv
e
r definition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Juni
o
C
Hamano
Add 'ident' co
n
version
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
M
e
rge branch 'jc/
t
h
e
-
index'
commit
|
commitdiff
|
tree
2007-04-25
Juni
o
C
H
amano
M
erge branch 'm
k
/diff'
commit
|
commitdiff
|
tree
2007-04-25
J
unio C Hamano
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-25
Junio
C
H
a
mano
Merge branch 'master' of
git://
r
e
p
o
.
or
.
cz/git/fa
s
timpo
r
t
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
apply
m
box
& quiltimport:
typofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
Hamano
gitattri
b
ute
s
documentati
o
n: clar
i
fy ov
e
rriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
t/test-lib
.
sh:
Protect o
u
r
s
elves from
c
ommon
m
isconfigura
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C H
a
mano
Diff
between two blobs should
t
ak
e
m
o
de chang
e
s into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C H
a
man
o
Me
r
ge
b
r
a
n
ch
'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio
C Hamano
Build
RPM with ETC_GITCON
F
IG=
/
etc/
g
itco
n
f
ig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio
C H
a
man
o
t
6030: gra
b
commit ob
j
ect name as
we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Hamano
t5302: avo
i
d using tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
Hamano
D
o
cume
n
t "
d
iff=driver" a
t
tribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Jun
i
o
C
Hamano
Make read-cac
h
e
.
c "the_index" fr
e
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C
H
amano
Move index-related variables into
a stru
c
tu
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Haman
o
S
u
pport
'
diff=pgm' a
t
tribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C H
a
m
ano
pac
k
-objec
t
s: make generated packf
i
le read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Update tests not to assume th
a
t generated packfi
l
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hama
n
o
Fix 'quickfix' on pack-obj
e
cts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
pa
c
k-objects: quic
k
fix f
o
r permission mod
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C
Hamano
Upd
a
te draft release notes for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
D
o
cumentati
o
n/Ma
k
ef
i
le: fix s
e
ctio
n
(5) i
n
stallatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Up
d
ate do
c
umentation links to
p
oint at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
Hamano
M
e
rge branch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C
Haman
o
Merge branch 'jc/a
d
d
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
Merge branch 'jc/
a
ttr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
Merge branch 'lt/
g
itlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge branch
'
np
/
pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Ha
m
ano
M
erge bra
n
ch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge b
r
anch 'jc/qui
c
kfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
branch '
m
aint
'
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Ham
a
no
GIT
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
lo
c
kfile: record the primary proce
s
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C H
a
mano
convert
.
c: restruc
t
ur
e
the attribute check
i
ng
p
a
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hama
n
o
Fix b
o
gus linked-list
managem
e
nt f
o
r user
defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
n
io C H
a
mano
git-clone: fix dumb protocol transport to clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
H
amano
git-add -u
:
m
a
t
ch the
i
nde
x
wit
h
working
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
D
ocument gitattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Ha
m
a
no
U
pdate 'crl
f
'
attribute s
e
mantic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Hamano
Documentation: supp
o
rt manual section (5) - file form
a
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
mano
Merg
e
b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o
C
H
a
mano
S
implify
c
o
de to f
i
nd recursi
v
e merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
C
oun
t
o-fix in
merge-r
e
cursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
e
r
ge
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
F
ix f
u
nny t
y
p
es use
d
i
n
a
ttribute val
u
e
representat
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
A
l
low low-leve
l
drive
r
to specify d
i
f
ferent behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level
m
erge driver: c
h
ange the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Al
l
ow the default low-lev
e
l merg
e
driver to be config
u
red
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hama
n
o
Custom
l
o
w
-leve
l
merge driver supp
o
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Me
r
ge branch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
erge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Update draft release notes for 1
.
5
.
2
with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
H
amano
Merge
bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io
C
H
amano
Start prepa
r
ing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
erge branch 'mast
e
r' of git://r
e
po
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C
Hamano
Merge branch 'ma
i
nt' of gi
t
://repo
.
or
.
cz/git-gui in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Haman
o
Me
r
ge branch
'
jc/read-t
r
ee
-
df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Add a demo
n
stration/t
e
st of
customize
d
merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Ham
a
no
All
o
w speci
f
y
ing specialized
merge-backend per pat
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
git-gui
:
H
ono
r
TCLTK_PATH if
supp
l
ied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
m
e
r
g
e-recursive: separ
a
te out xdl_merge()
i
nterface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Al
l
ow more
t
han true/fal
s
e
to
attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io
C
Hamano
Make sure
q
uickfet
c
h is no
t
fooled with
a
previ
o
us
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Ham
a
no
Merg
e
br
a
nch 'js/wra
p
-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
send-em
a
il: do
n
ot leav
e
an emp
t
y
C
C: l
i
ne if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Ha
m
ano
M
e
r
g
e bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C
H
a
m
a
no
C
hange at
t
ribute negation marker 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 attribute m
a
cro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
io C Haman
o
attribute m
a
cro
s
u
p
port
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Makefile: add
p
a
tch-ids
.
h bac
k
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C
Ham
a
no
F
ix 'diff' attrib
u
te semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'crlf' att
r
ibute seman
t
ics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Merge git://git2
.
k
e
r
n
el
.
org/pub/scm/
g
i
t
k/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
unio C H
a
man
o
T
ea
c
h 'di
f
f' ab
o
ut '
d
iff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Define 'c
r
lf'
a
t
tribu
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Add basic
infrastructur
e
t
o
a
ssign
a
ttributes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C
H
amano
Repl
a
ce a pa
i
r
o
f
patches wi
t
h u
p
dated
ones for subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do not defau
l
t to -
-
no-in
d
ex
w
hen
g
iven
t
wo di
r
ectories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
M
e
rge
b
ranc
h
'jc/che
r
ry'
commit
|
commitdiff
|
tree
next