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
Merge branch 'maint'
2007-05-02
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-05-02
Junio C
Hamano
M
e
rge branch 'main
t
' of git://rep
o
.
or
.
cz/git/f
a
sti
m
p
ort
.
.
.
commit
|
commitdiff
|
tree
2007-05-01
Junio C Hamano
G
I
T v1
.
5
.
2-
r
c1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-05-01
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-05-01
Junio C Hamano
GIT v1
.
5
.
1
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-30
Junio C Hamano
Fix symlink handlin
g
in g
i
t-svn
,
related to PerlIO
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
J
uni
o
C
Ha
m
ano
M
e
r
ge
b
ranch 'jc/att
r
'
commit
|
commitdiff
|
tree
2007-04-29
Junio C H
a
mano
Mak
e
su
r
e test-
g
e
nra
n
dom and te
s
t-chmti
m
e are
buil
t
as
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
J
unio C Hamano
Make macros to prevent dou
b
l
e
-inclusion
i
n headers
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Haman
o
A
pply m
a
i
l
ma
p
in gi
t
-
b
lame ou
t
p
u
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C Hamano
Split
o
ut mailmap h
a
ndl
i
ng out of shortlog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Jun
i
o
C Haman
o
blame -s: suppres
s
au
t
h
o
r name
a
nd tim
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
Hama
n
o
Merg
e
commit 'gfi/master'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Ham
a
no
M
erge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hama
n
o
Fix impo
r
t-tar
s
fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C Hamano
U
pdate
.
mailmap with "Mi
c
h
ae
l
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Jun
i
o
C Hamano
D
o
n
ot bar
f
on too long action descripti
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io
C
Haman
o
Merge br
a
n
c
h
'
maint'
of git://repo
.
or
.
cz/git/fastim
p
o
r
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
St
a
rt preparing for 1
.
5
.
1
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-26
Junio
C
Haman
o
Add --date={local,relative,de
f
a
u
lt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Ha
m
ano
Add
'fi
l
ter' attribute and e
x
ternal filter driver
d
efinition
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C
Hamano
Add 'ident' conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Ham
a
no
Merge branch 'jc/the-index'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Me
r
ge bra
n
c
h
'mk
/
di
f
f'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hama
n
o
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-25
Junio C H
a
ma
n
o
Merge branch 'ma
s
ter' of git://rep
o
.
or
.
c
z/git/fas
t
i
m
port
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C Hamano
ap
p
lymbox &
quilti
m
p
o
rt: typo
f
i
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Ham
a
no
gita
t
t
r
ibute
s
d
o
cu
m
entation: clarify overri
d
ing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C
H
a
man
o
t/tes
t
-lib
.
sh: P
r
ote
c
t
ourselves
from common m
i
sconfigur
a
ti
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Hamano
D
iff
betwe
e
n
two b
l
obs
s
h
o
uld take mode chan
g
e
s
int
o
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
n
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-24
J
u
n
i
o
C
Hamano
Build RPM
wit
h
E
T
C_GITCONFIG=/etc/gitconf
i
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
H
a
m
a
no
t
60
3
0:
g
r
a
b
commit
object name
a
s we
go
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C Hamano
t5302: av
o
id us
i
ng ta
i
l -c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
Hamano
Document "d
i
ff=driv
e
r" attr
i
but
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Ham
a
no
M
ake read-ca
c
he
.
c "the_index"
f
ree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Hamano
Move inde
x
-related
v
a
riables into a struct
u
re
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
Hamano
Support 'diff
=
p
gm
'
attribu
t
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ha
m
a
n
o
pack-
o
bjects:
make ge
n
erated packfile re
a
d-
o
nly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
uni
o
C Hamano
Update tests not to assume
t
h
at genera
t
ed packfile
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
Hamano
Fix 'quickfix' on p
a
c
k-objects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
pa
c
k-object
s
: quickfi
x
f
or permission modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update dr
a
ft relea
s
e no
t
es for
v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C
Hamano
Documentation/Make
f
ile:
fix section (5) inst
a
llat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update documen
t
ati
o
n lin
k
s to
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 Hamano
Me
r
g
e
branch '
l
t/ob
j
a
l
loc'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Ha
m
a
n
o
Me
r
ge branch
'
jc/add'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C
H
amano
Merge branch 'jc
/
a
t
tr'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Merge b
r
anch 'lt/git
l
ink'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Merge bra
n
ch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Merg
e
branch 'jp/ref
s
'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Ham
a
no
Merge
b
ran
c
h 'jc/quic
k
fetch'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Ha
m
ano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Hamano
loc
k
file:
r
e
cord the primary process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Ha
m
a
no
conve
r
t
.
c:
re
s
tructure the att
r
i
b
ute checking
p
art
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
Fix
bogus l
i
nked-l
i
st m
a
n
agement for user defined merg
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
ma
n
o
git-clo
n
e: fix dumb protocol tra
n
s
p
ort
to clone
f
rom
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
git-
a
dd -u: m
a
tch
t
he index with working tr
e
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
D
o
c
ument
gitattributes
(
5
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C
H
amano
Update
'crlf' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
D
ocumentation: s
u
pport
m
anual section (5) - file formats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ham
a
n
o
Mer
g
e branc
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simpli
f
y
code to fi
n
d recurs
i
ve mer
g
e dri
v
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
H
aman
o
C
o
unto-fi
x
in merge-rec
u
rsive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Fix funny types used in at
t
ribute value r
e
present
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
A
llow low
-
lev
e
l
d
r
iver
t
o specify different behav
i
our
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-l
e
v
e
l
mer
g
e
driver: chang
e
the configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Allow the def
a
u
l
t
low-level
m
erge
dri
v
er
to be
config
u
red
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Custom
l
ow-level merge d
r
iver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
e
rge branch
'
fl/
c
vsserver'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C
Hamano
Merge
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Update draft release notes f
o
r 1
.
5
.
2
w
i
th accumu
l
ated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Ham
a
n
o
Mer
g
e
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
S
tart preparing for
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
e
rg
e
branch 'm
a
s
ter' of g
i
t://repo
.
or
.
c
z/git-
g
u
i
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Merge
b
ranch 'maint' of git:/
/
r
epo
.
or
.
c
z
/
git-gui
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
Merge branc
h
'jc/rea
d
-
t
r
ee-
d
f'
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Add a d
e
monstratio
n
/test of cus
t
o
m
ized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
llo
w
s
p
ec
i
fying spec
i
ali
z
e
d merge-backe
n
d
per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C
H
amano
git-gui: Honor TC
L
TK
_
PATH if supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o
C
Hamano
mer
g
e-recur
s
ive: separate
out xdl_m
e
r
g
e() i
n
terf
a
ce
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C H
a
man
o
Allow m
o
re than true/false to attr
i
butes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
Make su
r
e qui
c
kfetch is not fooled w
i
th a pr
e
vious
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
M
e
rge branch 'j
s
/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
send-email: do no
t
leave
an empty CC: l
i
ne
i
f no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C H
a
m
a
no
M
er
g
e branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-16
J
unio C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Haman
o
C
h
ange
at
t
ribute negation
mar
k
er f
r
om '!
'
t
o '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Def
i
ne
a built-in attrib
u
te
m
acro
"
b
i
nary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
ma
n
o
a
t
tribute macro
s
upp
o
rt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
aman
o
Mak
e
fil
e
: add patc
h
-ids
.
h back i
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix '
d
iff' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C Haman
o
Fix
'crlf' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
uni
o
C Hamano
M
erge git
:
//
g
i
t2
.
kernel
.
or
g
/pub/scm/git
k
/
g
it
k
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
Teach 'diff
'
about 'diff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next