repo.or.cz
/
git
/
jrn.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.2
2007-04-29
Junio
C Hamano
Fix import-tar
s
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C Haman
o
Up
d
a
t
e
.
mailmap with "Michael
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
H
amano
D
o not barf o
n
to
o
long action des
c
ription
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merge br
a
nch 'maint' of git://repo
.
o
r
.
cz/git/fas
t
import
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Jun
i
o C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Start pr
e
parin
g
for
1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Juni
o
C H
a
mano
A
d
d --date={local,relativ
e
,
d
efaul
t
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Ju
n
io C Hamano
A
dd 'fil
t
er'
attribute and exter
n
a
l filter drive
r
d
efi
n
ition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C Hama
n
o
Add 'ident' conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Jun
i
o C
H
amano
Mer
g
e branch 'jc/the-in
d
ex'
commit
|
commitdiff
|
tree
2007-04-25
Juni
o
C Hamano
Mer
g
e branch 'mk
/
diff'
commit
|
commitdiff
|
tree
2007-04-25
Juni
o
C H
a
m
a
n
o
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge
branch 'm
a
ster
'
of gi
t
://repo
.
or
.
cz/git/f
a
s
timp
o
r
t
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Ham
a
no
applymbox
&
q
uil
t
import: typofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C H
a
mano
gitatt
r
ibu
t
es documentation:
cl
a
rify
o
verriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
t/test-lib
.
sh: Pr
o
t
ect oursel
v
e
s
f
rom commo
n
misconfiguration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Ham
a
no
Diff between two
b
lobs
s
hould take mode changes
i
nto
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
un
i
o C
H
a
m
a
n
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
B
uild R
P
M with ET
C
_GITCONFIG=/e
t
c
/
gitconfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Hamano
t
6
030: grab
c
ommit object name as we g
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io
C Hamano
t5
3
02: a
v
oid using tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Hamano
D
o
cument "diff=d
r
iver"
a
tt
r
ibute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C Ha
m
a
n
o
Make
read-ca
c
h
e
.
c "the_inde
x
" free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
n
io C Hamano
Move
index-related variab
l
es into a struct
u
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
S
upport 'dif
f
=pg
m
'
a
t
t
ribu
t
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
unio
C Hamano
pack-objects: ma
k
e g
e
nerated packfile read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
Ham
a
no
Upda
t
e tests
not to assume that generated packfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Fix
'
q
uickfix' on pack-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
pack-ob
j
ec
t
s: qu
i
ckf
i
x for permission mo
d
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Update draft release n
o
tes for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Documentation/Makefi
l
e: fix sec
t
io
n
(5) instal
l
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
U
pdate d
o
c
umenta
t
ion lin
k
s to point a
t
v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
i
o C H
a
mano
Merge
branch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C
H
a
ma
n
o
Merge br
a
nch
'
jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Haman
o
Merge branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
man
o
Merge branch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hama
n
o
M
erge b
r
anch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C H
a
ma
n
o
M
e
rge bran
c
h
'
j
p/
r
efs'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Mer
g
e
branch
'
jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C
H
amano
Merg
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
ano
l
o
ckfi
l
e: r
e
c
o
rd the primary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
i
o C H
a
mano
c
o
nvert
.
c:
r
estructure the attr
i
bute c
h
ecking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C
H
aman
o
F
ix bogus linked-list management for user defined merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Hamano
git
-
clon
e
: fix dumb p
r
otocol transpo
r
t 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
git-
a
d
d -
u
: match the ind
e
x with w
o
r
k
ing
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
H
amano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hama
n
o
Document gitatt
r
ibutes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
Update
'
c
r
l
f' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o
C Hamano
Do
c
umentation: s
u
pport manual section (5) - file
f
ormats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
M
erge
b
ranc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ham
a
no
S
i
mplify co
d
e
to find
recu
r
sive
me
r
ge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto
-
fi
x
in merge-
r
ecur
s
ive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
ano
Merge bra
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Fix
funny type
s
used in attribute value re
p
re
s
entat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ham
a
no
Allow low-
l
evel
d
r
i
v
er to specify
d
ifferent behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Custom low-l
e
ve
l
merge dr
i
ver: chang
e
the
c
o
n
f
iguration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C Haman
o
Allow
t
h
e default low-leve
l
merge driver to be configur
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Cu
s
t
om low-level merge driver
s
upport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
M
e
r
ge branch
'
fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Mer
g
e branch '
m
a
i
n
t'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Upda
t
e draft release not
e
s for 1
.
5
.
2
w
i
th accumulat
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
Merge b
r
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
an
o
S
t
art preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Merge branch
'master'
o
f git://re
p
o
.
or
.
c
z
/g
i
t-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge bra
n
ch
'maint' of git:
/
/repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hama
n
o
Merge bra
n
ch
'jc/
r
ead-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
Add a demonstration/
t
e
s
t of customized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Al
l
ow specifying speci
a
liz
e
d merge-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
: Honor TCLTK_PATH i
f
supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
merge-rec
u
rsive: separate out xdl_mer
g
e() inte
r
face
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Ham
a
no
Allow more
than true/false to
a
ttributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ha
m
an
o
Make sure quickfetch
i
s not
f
o
oled wi
t
h a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o
C
Hama
n
o
M
e
rge bran
c
h 'js/wrap-lo
g
'
commit
|
commitdiff
|
tree
2007-04-16
J
un
i
o
C Hama
n
o
send-email: do not
leave an
empty CC: l
i
ne if n
o
cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io C Haman
o
Merg
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Change attr
i
bute negation marker from '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C
Haman
o
Define
a built-in at
t
ribute
m
acro "bi
n
ary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
a
t
t
r
ibu
t
e
macro sup
p
ort
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
a
mano
M
a
kefil
e
:
add patch-ids
.
h b
a
ck in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Fix
'
diff' attribute se
m
antics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Ham
a
n
o
Fix 'crlf' attribute
s
ema
n
t
ics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
M
erge git://git2
.
kerne
l
.
org/p
u
b/scm/gitk/gitk int
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C
Hamano
Teach 'd
i
ff' about 'diff' att
r
ibu
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Hama
n
o
Define 'crlf'
a
ttribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
Add basic
i
nfrastructure to assign attribute
s
to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Ha
m
an
o
Merg
e
branch '
m
aint
'
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Re
p
l
a
ce a pai
r
of patches w
i
th upd
a
ted ones for subproje
c
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C H
a
mano
Do not default to --no-index wh
e
n
given two
d
irector
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C Hamano
Merge branch
'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branc
h
'
m
ain
t
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
a
mano
F
i
x git {
l
og,show,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Ha
m
ano
Docume
n
tation: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ham
a
n
o
git-log -
-
c
h
erry
-
pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Ref
a
c
tor patch-i
d
filtering out of git-c
h
er
r
y a
n
d git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
Add %
m
to '-
-
pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
M
erge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
G
I
T 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next