repo.or.cz
/
git
/
jnareb-git.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-06
Ju
n
io C Haman
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-05-06
Junio C Ham
a
no
Add
test for
blame corner c
a
ses
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Junio C Ha
m
a
no
blame: -
C
-
C
-
C
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Juni
o
C
Hamano
blame:
Notice a who
l
e
s
a
le incorp
o
ration of an existing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-04
Jun
i
o C Ham
a
no
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-05-04
Ju
n
io
C
Hamano
di
f
f
.
c: f
i
x "s
i
ze
c
ache" handl
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-03
Juni
o
C Hamano
blame: use
.
m
ailmap unconditi
o
nally
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-02
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-05-02
Juni
o
C Hamano
Merge
branc
h
'maint' of gi
t
://repo
.
or
.
cz/git/fasti
m
port
.
.
.
commit
|
commitdiff
|
tree
2007-05-01
Junio C Hamano
G
IT v1
.
5
.
2-rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-01
Junio
C H
a
mano
Merge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2007-05-01
Junio C
H
am
a
no
GIT v1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-30
J
unio C
Ham
a
no
Fix sym
l
ink handling in git
-
svn, r
e
lated to PerlIO
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io C Hamano
Merge
branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-29
J
u
ni
o
C Hamano
Make
s
ure te
s
t-genrandom and tes
t
-c
h
m
time are
b
uilt
a
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C H
a
mano
Make m
a
cros
to p
r
event double-inclusion in header
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Apply mailm
a
p
i
n
g
it-blame
o
utput
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Split
o
u
t
m
a
ilmap handling
o
ut of shortlog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
unio C Hamano
b
l
ame -s
:
suppress author name and
time
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merge commit 'gfi/ma
s
ter'
commit
|
commitdiff
|
tree
2007-04-29
J
uni
o
C Ham
a
no
M
erge
b
r
a
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-04-29
J
u
n
io C
H
amano
Fix import-
t
ars
fi
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Jun
i
o C Hamano
Update
.
mailmap with "Michael"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
H
amano
Do not b
a
r
f on too lo
n
g acti
o
n description
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C
Hamano
Merge branch 'maint' of git:/
/
repo
.
or
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Junio C Hamano
M
erge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C H
a
m
a
no
Me
r
ge b
r
anch
'
m
a
i
nt
'
commit
|
commitdiff
|
tree
2007-04-26
J
u
nio C
H
ama
n
o
S
t
art preparing for 1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Jun
i
o C Hamano
Add --date
=
{
l
ocal
,
relative,default}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
J
un
i
o C Hamano
A
dd
'filter' attribute a
n
d external filter driver defini
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio
C
H
a
mano
Add 'ident' conversi
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C Hamano
Mer
g
e branc
h
'jc/the
-
in
d
e
x
'
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C Hamano
Merge branch 'mk/dif
f
'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge bran
c
h 'master' of git://repo
.
or
.
cz/git/fasti
m
p
o
rt
commit
|
commitdiff
|
tree
2007-04-24
Junio
C Hamano
applymbox & qu
i
ltimpor
t
: typofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
no
gi
t
attribu
t
es documentation: clarify overriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t/te
s
t-lib
.
sh: Protect ourse
l
ves fro
m
c
o
m
mon misconfigur
a
t
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Diff between t
w
o
blo
b
s sho
u
ld take mode chang
e
s
i
n
to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
H
amano
Merge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio
C
H
amano
Build RPM wit
h
ETC_GITCONFIG=/etc/gi
t
config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ha
m
ano
t6030: grab commit obje
c
t na
m
e as
we
go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
i
o C Hamano
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
Do
c
ument "dif
f
=dr
i
ver" attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Hamano
Make r
e
ad-
c
a
c
h
e
.
c "the_index" fre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Move index-related variables into a structure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Haman
o
Support 'diff=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C Ham
a
no
pa
c
k
-objects: make generated packfile read-
o
nly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Ha
m
ano
Update te
s
ts not to assu
m
e
tha
t
generated
packfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fix
'
qu
i
ckfix' on pack-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
pack-object
s
: quick
f
ix for permissio
n
mo
d
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
Hamano
Update
dr
a
ft release not
e
s
f
or
v
1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
D
ocumentation
/
M
a
kefile
:
fix section (5) installation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update documen
t
ation l
i
nk
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
Junio C Ha
m
ano
M
e
rge
b
r
a
nc
h
'lt
/
obja
l
loc'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge br
a
nch 'j
c
/add'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
H
a
mano
Merge branch 'jc/
a
t
t
r'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
M
e
rge branch 'l
t
/
g
itlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge bran
c
h 'np
/
pack'
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C
Ham
a
no
Merge b
r
anch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
M
erge branch 'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Haman
o
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C
H
amano
l
o
c
k
file: record
t
he prima
r
y process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Haman
o
co
n
vert
.
c: restructur
e
the attribute
checking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Hamano
Fix bogu
s
linked-list man
a
g
ement for use
r
d
e
f
i
ned
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
git-clone: fix
d
umb pro
t
ocol
tra
n
s
p
ort t
o
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
gi
t
-
a
d
d
-u: match the index with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Merge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C
H
ama
n
o
Document gitattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
Update 'crlf' at
t
ribute semant
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
Docum
e
ntation: support
ma
n
ual section (5
)
-
f
ile
f
ormats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simpl
i
fy code to
f
i
nd recursive merge drive
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Co
u
nto-fix in merge-recurs
i
ve
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Fix funny t
y
pes used in attribute value repr
e
sentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allo
w
low
-
l
evel drive
r
to specify d
i
fferen
t
behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
amano
Cus
t
om low-leve
l
merge
driver: change the conf
i
g
uration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Allow the
d
efault low-level merge d
r
iver
t
o be co
n
fi
g
ured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Custom low-level mer
g
e driver supp
o
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Merge br
a
nch 'fl/cvsserv
e
r'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
H
amano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hama
n
o
U
p
date
d
ra
f
t rele
a
s
e
n
o
tes for 1
.
5
.
2 wi
t
h accu
m
ulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Me
r
ge b
r
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Start pre
p
ari
n
g
for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
M
er
g
e branch 'master' o
f
g
i
t:
/
/repo
.
or
.
cz/
g
i
t
-
gui
commit
|
commitdiff
|
tree
2007-04-18
J
u
ni
o
C Hamano
M
erge
bran
c
h 'main
t
'
o
f
git://repo
.
or
.
c
z
/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Ham
a
no
Merg
e
branch 'jc/read
-
t
r
ee-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Add
a demonst
r
at
i
on/test of customiz
e
d merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
All
o
w specify
i
ng spe
c
ialized merge-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
Ham
a
no
g
i
t
-g
u
i: Hon
o
r TCLTK_PA
T
H if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
uni
o
C H
a
mano
merge-recursive: separate out
x
d
l
_merge() in
t
erface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
Allow
more than true/fa
l
se to attribute
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o
C
Hama
n
o
Make
s
ure quickfetch is no
t
f
o
o
led with a p
r
evious
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge bra
n
ch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
aman
o
se
n
d-email:
do
n
ot leave an
e
mpt
y
CC: line if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ha
m
a
no
Mer
g
e b
r
a
n
c
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-16
J
u
n
i
o C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Change attr
i
b
u
te negat
i
o
n marker from '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next