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
J
un
i
o C Hamano
M
erge branch
'maint'
commit
|
commitdiff
|
tree
2007-05-06
Junio C Hamano
Add test for
b
lame
c
orner cases
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-05-06
J
u
nio C Hamano
blame
:
-C
-C -C
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-05-06
J
unio C Haman
o
b
lam
e
: Notice
a wh
o
les
a
le
incorpora
t
i
on of an existing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-05-04
Junio
C
Hamano
Me
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-05-04
Junio C Hamano
dif
f
.
c: fix "size cache" handling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-05-03
Junio C
Hamano
blame: use
.
m
a
i
l
map unconditional
l
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-05-02
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-05-02
Junio
C
H
amano
M
erge branch 'maint' of git:
/
/repo
.
or
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-05-01
Jun
i
o C H
a
mano
GIT v1
.
5
.
2-rc1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-05-01
Junio C Hamano
Merge branc
h
'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-05-01
Junio C Hama
n
o
GIT v1
.
5
.
1
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-30
Ju
n
io C Haman
o
Fix symli
n
k
h
andling i
n
git-svn, related t
o
PerlIO
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merge
branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-29
Junio C
H
a
m
ano
Make sure test-genr
a
n
dom and te
s
t-chmtime are builtas
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
J
unio C Hamano
Make
m
acros t
o
prevent
double-inclusion in hea
d
ers
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C
H
a
ma
n
o
A
pply mailmap in
git-blame out
p
u
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hama
n
o
Split ou
t
mailmap handling out of shortlog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Ha
m
a
n
o
bl
a
me
-s: s
u
ppre
s
s auth
o
r name an
d
time
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
J
unio C
Ham
a
n
o
M
erge commit 'gfi/m
a
s
t
er'
commit
|
commitdiff
|
tree
2007-04-29
J
unio C Hamano
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-29
Jun
i
o C
Hamano
Fix i
m
p
o
rt-tars fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Updat
e
.
mailmap with "Mich
a
el"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Jun
i
o C Ham
a
no
Do not
barf on too long actio
n
descr
i
ption
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C Ha
m
ano
Merge branch 'main
t
' of git://rep
o
.
or
.
cz/
g
it/fastimpo
r
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Junio C Hamano
M
erge branc
h
'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-26
J
unio C Hamano
M
e
rge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-26
J
u
nio C H
a
mano
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 Hamano
Add --d
a
te={local,
r
ela
t
i
ve,defaul
t
}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-25
Junio C
Haman
o
A
d
d 'filter' at
t
ribute and external fi
l
ter driver definitio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio
C
Haman
o
A
dd 'ident' conv
e
r
sion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-25
Junio C H
a
mano
Merge branch 'jc/the-index'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge
branch '
m
k
/
d
i
ff'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C Hamano
Merge branch
'
master' of git://
r
epo
.
or
.
cz/git
/
fastim
p
ort
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
applymbox & quil
t
im
p
ort: typofix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C H
a
mano
gitattributes documentat
i
on: clarif
y
o
v
erriding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t/test-
l
ib
.
sh:
P
r
o
tect ou
r
selves
f
r
om common misconfiguration
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o
C
Haman
o
Diff betw
e
en
two b
l
obs sho
u
ld take
m
o
de changes int
o
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C Ham
a
n
o
Build RPM with ETC_GIT
C
ONFIG
=
/etc/gitconfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C
H
a
mano
t
6
030: gra
b
commit object name as we go
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hama
n
o
t5302: avoid
u
sing ta
i
l -c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C Hamano
Document
"
d
iff=d
r
iver" attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Make r
e
ad-ca
c
h
e
.
c
"the_index" free
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C Hamano
Move
index-related v
a
riables into
a
structure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ham
a
no
Supp
o
rt 'd
i
ff=pgm' attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Hamano
pack-objects: mak
e
genera
t
ed
packfile read-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Up
d
ate te
s
ts not to assume th
a
t generated pack
f
iles
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
F
i
x '
q
uickfix' on
p
ack-objects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
un
i
o C H
a
mano
pack-
o
bj
e
cts: quickfix for permission
m
ode
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Upd
a
te draft r
e
lease notes for v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Ham
a
no
Documen
t
a
t
i
o
n/
M
akefile: fix se
c
ti
o
n (5) installa
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hama
n
o
Update documentation links to
point at
v
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
a
no
Merge br
a
nch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
H
amano
Mer
g
e branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge bra
n
ch 'jc/a
t
tr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
n
o
Merge branch
'
lt
/
gitlink'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge branc
h
'np/pa
c
k
'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Haman
o
Merge branch
'
jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Mer
g
e branch 'jc/
q
u
ickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C
H
a
m
a
n
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Ha
m
ano
G
I
T 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
lockfile:
r
e
cord th
e
primary
proc
e
ss
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
co
n
vert
.
c: restructure
t
he
a
t
tribute ch
e
ckin
g
part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
amano
F
i
x
bog
u
s linked-li
s
t m
a
n
a
g
e
m
ent
f
or user define
d
merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hama
n
o
git-clone:
f
ix dumb pro
t
ocol transpo
r
t to clone f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Haman
o
g
i
t-ad
d
-u: ma
t
ch t
h
e i
n
dex with working tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hama
n
o
M
e
rge b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Ha
m
an
o
D
o
cum
e
nt gita
t
tributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
Update
'
cr
l
f' a
t
tribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
D
o
cumentation:
s
upport
manual s
e
ctio
n
(5) - file form
a
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C H
a
mano
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Hamano
Simplify cod
e
to find recursi
v
e
merge dri
v
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Hamano
Counto-fix in mer
g
e-recur
s
ive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C H
a
m
a
no
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Fix funny types used in at
t
ribu
t
e val
u
e
r
epr
e
sen
t
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Allow
low
-
level
d
rive
r
to
s
pe
c
ify different
behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level merge driver:
change the c
o
nfi
g
uration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
m
a
no
Allow
the default low-level merge driver t
o
be co
n
figure
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Custom low-level merge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge
br
a
nch 'f
l
/
cv
s
server'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ham
a
no
Merge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Update d
r
aft re
l
ease notes for 1
.
5
.
2 with
a
ccumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Start prepari
n
g f
o
r
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
unio C H
a
m
a
no
Me
r
ge
b
ran
c
h 'mas
t
er' of
git:
/
/re
p
o
.
o
r
.
cz/git-gu
i
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Me
r
g
e
b
r
anch '
m
a
i
nt
'
of gi
t
:/
/
repo
.
or
.
cz/git-
g
ui
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
amano
Merge
br
a
nch 'jc/rea
d
-tre
e
-
d
f'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a d
e
monstrat
i
o
n/test
o
f
custom
i
ze
d
merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
Allow spec
i
fying s
p
ecialized merge-backend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
git-gui
:
Honor TCLTK_P
A
TH if su
p
plied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
a
n
o
merge-recur
s
iv
e
: separate out xdl_merge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
l
low m
o
r
e than true/false to
a
ttributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Haman
o
Make sur
e
quickfetc
h
is not fooled with a
p
revious
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Ha
m
a
n
o
M
er
g
e
branch 'js/wr
a
p-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Hamano
send-email:
d
o not leave an empty CC:
line if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
u
n
i
o C Hama
n
o
M
e
r
g
e branch
'main
t
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Change attribute nega
t
ion marker f
r
om '!
'
to '
-
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next