repo.or.cz
/
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-07
Junio C Hama
n
o
Me
r
ge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-05-07
J
u
nio C Haman
o
Merge branch 'maint'
o
f git://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-05-07
Junio C H
a
mano
Merge git:
/
/git2
.
kerne
l
.
org/p
u
b/scm/gitk/gitk i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-05-06
Junio C
H
a
man
o
GIT v1
.
5
.
2-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Juni
o
C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-05-06
Junio C Hama
n
o
A
dd test for blame corne
r
cases
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Junio C Hamano
blam
e
: -C
-C -C
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Junio C Hamano
blame: Notice a
wholesale
i
ncorp
o
ra
t
ion of an exi
s
ting
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-04
J
u
nio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-05-04
Junio C Hamano
diff
.
c: fix "
s
ize cach
e
" handling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-03
Junio
C
H
a
mano
blame:
u
s
e
.
mai
l
ma
p
un
c
onditi
o
nal
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-02
Junio C Hamano
Mer
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-05-02
Juni
o
C Hamano
Merge
branc
h
'm
a
i
nt'
o
f git://re
p
o
.
or
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-05-01
Juni
o
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
a
nch
'
mai
n
t'
commit
|
commitdiff
|
tree
2007-05-01
Jun
i
o C Hamano
GIT v1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-30
Junio C Ham
a
no
Fix symlink handling
i
n git-svn, r
e
lated to Pe
r
l
I
O
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merge br
a
nch 'jc/a
t
tr'
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
H
a
mano
Make sure t
e
s
t-genrandom and test-c
h
mtim
e
a
re buil
t
as
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Make macros to prev
e
nt doub
l
e-inclusion in h
e
aders
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Juni
o
C Ham
a
n
o
A
p
ply
m
ailmap
in git-blame
o
utput
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
Ha
m
ano
S
p
l
it out mailmap handling out of shortlog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
blame
-s: suppress author na
m
e an
d
time
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merge commit 'gfi/mast
e
r'
commit
|
commitdiff
|
tree
2007-04-29
J
u
n
i
o
C
Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Ham
a
no
Fix impo
r
t-ta
r
s fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Upd
a
te
.
mailmap with "Mi
c
hael"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Juni
o
C Hamano
Do no
t
barf o
n
too long act
i
on descr
i
ptio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hama
n
o
Merge branch 'maint' of git://r
e
po
.
or
.
c
z/gi
t
/
fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Ju
n
io C Ha
m
ano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Jun
i
o C
H
a
m
a
no
Merge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Ham
a
n
o
S
t
art prepa
r
i
n
g
f
or 1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Junio
C
Hamano
Add --da
t
e={loca
l
,relative,default}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C
H
am
a
no
Add '
f
ilter' att
r
i
but
e
and external filter d
r
i
v
er definit
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
J
u
n
i
o
C
Hamano
A
d
d
'
i
den
t
' conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Ju
n
io C Hamano
Mer
g
e branch 'jc/the-
i
ndex'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch 'mk/
d
iff'
commit
|
commitdiff
|
tree
2007-04-25
Jun
i
o C Hamano
M
erge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge bran
c
h 'master'
o
f
git:
/
/repo
.
or
.
c
z
/
git/fastimport
commit
|
commitdiff
|
tree
2007-04-24
Junio C
Haman
o
applymbox
&
q
u
i
ltimport:
t
ypofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
gi
t
attributes documentation: clari
f
y overriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
Hamano
t/t
e
st-lib
.
sh: Pr
o
t
ect
ourselves fr
o
m
comm
o
n misc
o
nfiguration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C H
a
mano
Diff between two
blo
b
s should take mode changes
into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io
C
Ha
m
ano
M
e
rge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C
H
amano
Build RPM
w
it
h
ETC_GI
T
CO
N
FIG=/etc/gitco
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
t6030:
g
rab c
o
mmit obje
c
t
n
ame as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t5302: avo
i
d
u
sing tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
unio
C
Hamano
Document "
d
iff=drive
r
"
a
ttribut
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Jun
i
o
C Hamano
Make read-cache
.
c
"
t
he_index"
free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
Hamano
Move index-related variables
i
n
t
o a structure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Su
p
port 'diff=pgm'
a
t
trib
u
te
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hama
n
o
pack
-
o
bjec
t
s: mak
e
generated pa
c
kfile read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
n
io C H
a
mano
Update tests not to
ass
u
me t
h
at g
e
n
erated packf
i
l
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
aman
o
Fix
'q
u
ick
f
ix' on pack-obj
e
cts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
pack
-
objec
t
s: quickfix for
per
m
i
s
sion
m
o
des
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o
C
Ha
m
ano
U
p
d
ate
draft r
e
l
e
a
se notes for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
Documentation
/
Makefil
e
:
fix section (
5
) inst
a
llation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
U
pdate doc
u
m
entation li
n
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
Juni
o
C Hamano
Mer
g
e bran
c
h 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
M
e
rge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Haman
o
Merge branch 'jc/att
r
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
ama
n
o
Merge branch 'l
t
/gitlin
k
'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
i
o
C H
a
man
o
M
e
rge branch 'jp/ref
s
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
erge branch 'jc/qui
c
kfet
c
h'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
l
o
c
kfile: r
e
cord
t
h
e
prima
r
y process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Ham
a
no
convert
.
c
: restructure the attribute checki
n
g part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Hamano
Fi
x
bogus
l
inked-list manag
e
m
ent for
u
ser defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
amano
git-
c
lone:
fix dumb prot
o
col tran
s
p
ort to c
l
one
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
unio
C
Hamano
git-add
-u:
m
atch the ind
e
x with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
Doc
u
men
t
gitattr
i
butes
(
5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C
H
a
ma
n
o
Upda
t
e 'crlf' at
t
ribute se
m
a
ntic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Documentation:
s
upp
o
rt manual section (5) -
file
format
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
unio
C
Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Juni
o
C H
a
mano
Simplify code t
o
fi
n
d r
e
cursive
merge
d
ri
v
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-fix in merg
e
-rec
u
rsive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix fun
n
y types u
s
ed in attribu
t
e v
a
lu
e
represen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
mano
Allow low-le
v
el dri
v
e
r
t
o
specify different behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
mano
Custom lo
w
-level merg
e
driver: c
h
an
g
e
t
he configurati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Al
l
ow th
e
def
a
ult low-level merge d
r
iver to be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Custo
m
l
ow-leve
l
merge
dr
i
ver sup
p
ort
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Merge branch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Haman
o
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C H
a
man
o
Upda
t
e
draft release notes for 1
.
5
.
2 with ac
c
umulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Start preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Merge branch
'
master' o
f
git://repo
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
m
a
n
o
Merg
e
br
a
nch
'm
a
int' of git:/
/
r
e
p
o
.
or
.
cz/g
i
t-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Merge branch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
Add a demon
s
t
r
ation/test of customized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
mano
A
l
low
s
pecify
i
ng spe
c
ia
l
ize
d
merge-backend p
e
r path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
git-gui: Honor TCLT
K
_PAT
H
if suppl
i
ed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
merge-
r
ecursi
v
e: separat
e
out
xdl_
m
er
g
e() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
io C Haman
o
Allow more
t
han true/false to
a
tt
r
ibutes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
Make s
u
re quic
k
fetch is not f
o
o
l
e
d with a previou
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio
C Hamano
Merge branch 'j
s
/wrap-log'
commit
|
commitdiff
|
tree
next