repo.or.cz
/
git
/
repo.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-09
Junio C Hamano
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-05-09
J
u
nio
C
Ha
m
ano
GIT v1
.
5
.
1
.
4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-07
Junio C
H
amano
Merge b
r
anch 'ma
s
ter' of
git:
/
/r
e
po
.
o
r
.
c
z/git
-
g
ui
commit
|
commitdiff
|
tree
2007-05-07
Junio
C
Ha
m
ano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-05-07
Junio C Hamano
Merge branch 'maint' of g
i
t:
/
/repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-05-07
J
u
n
io C Hamano
Mer
g
e g
i
t://git
2
.
k
e
rnel
.
org/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-05-06
Junio C
H
amano
GIT v1
.
5
.
2-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
J
unio
C Hamano
Merge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2007-05-06
Junio C Haman
o
A
dd t
e
st for
b
l
a
m
e
c
orner cases
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Junio C Hamano
blame: -C -C -C
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Junio C
H
amano
b
l
a
me: Notice a
w
holes
a
le
in
c
orporation of an ex
i
sting
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-04
Junio C Hamano
Me
r
ge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2007-05-04
J
u
ni
o
C Hamano
diff
.
c: fix "si
z
e cache" handling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-03
J
u
n
i
o
C
H
a
mano
blame: use
.
mailmap
u
n
conditio
n
ally
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-02
Junio
C
H
a
mano
M
er
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2007-05-02
Junio C
Hamano
Merge branch 'ma
i
nt' of git://
r
epo
.
or
.
cz/git/f
a
stimport
.
.
.
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
M
erg
e
b
r
a
n
c
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-05-01
Jun
i
o C Hamano
GIT v
1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-30
Junio C Hama
n
o
Fi
x
symlin
k
handling in git-svn, related to Per
l
I
O
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
H
aman
o
Merg
e
br
a
nch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
Hamano
Make sure tes
t
-
genrandom an
d
test-chmtime
a
re builtas
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Make macros
t
o prevent doubl
e
-inclusion i
n
headers
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Ham
a
no
Apply
m
a
ilmap
i
n gi
t
-blame
o
u
tput
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Split
out m
a
ilmap handl
i
ng out o
f
s
h
ortlog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C Hama
n
o
blame
-s: suppress autho
r
na
m
e and t
i
me
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merge commit
'
g
fi/master'
commit
|
commitdiff
|
tree
2007-04-29
Junio C H
a
m
a
no
Merge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
i
o C Ha
m
ano
Fix
i
mport-tars
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C Hamano
Update
.
mailma
p
w
i
t
h
"Micha
e
l"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Do
not barf on t
o
o l
o
ng
a
ction description
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Juni
o
C Haman
o
Merge branch 'maint' of gi
t
:/
/
re
p
o
.
o
r
.
cz/git/fas
t
i
m
por
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Ju
n
io C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Merge branch
'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Start preparin
g
for 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={local,relat
i
ve,de
f
a
u
lt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Haman
o
Add 'f
i
lter'
attribute and
ext
e
rnal filter driver d
e
f
i
ni
t
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio
C
Haman
o
Add
'
ident' conversio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch 'jc/the-inde
x
'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Ha
m
ano
Merge branch 'mk/diff'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
M
erge br
a
n
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-25
Junio C H
a
m
a
no
Merge
bra
n
ch
'mas
t
er' of git:/
/
repo
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-04-24
J
un
i
o C Ham
a
no
ap
p
lymbox
& quilti
m
p
o
r
t:
t
ypofi
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
unio C Hamano
gitattributes documentation
:
clarify overriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C Hamano
t/test-lib
.
sh
:
Protect ourselves from common misconfiguration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
uni
o
C Hamano
Diff between two blobs should
t
ake mo
d
e
c
han
g
es
int
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Haman
o
Bu
i
ld RPM with
E
TC_GITCONF
I
G=/
e
tc/gi
t
co
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
unio
C Ha
m
ano
t6030: grab
c
o
mmit
object name as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ha
m
a
n
o
t5302: avoid us
i
ng tail
-c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Document "diff=driver" a
t
t
r
ibut
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Make
r
ead-cac
h
e
.
c "the_index" free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Haman
o
Move index-related
v
ariable
s
into a
s
tructure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Support
'diff=pgm
'
attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
i
o C Hamano
pack-objects: make gen
e
ra
t
ed packf
i
le
r
ead-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ham
a
no
Update test
s
not t
o
assume that gener
a
ted
p
ackfil
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Fix 'quickfix' on
pack-ob
j
ects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
pack-objects: quickfix for permiss
i
on mod
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
U
p
d
at
e
draft release notes
for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Docu
m
entati
o
n/Make
f
ile: fix section (5) installation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
Update documentation link
s
to point
a
t v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch
'l
t
/objalloc
'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
M
erge b
r
anch 'jc/add
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Merge branc
h
'jc
/
attr'
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
i
o C Ha
m
an
o
Merge br
a
nch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge bra
n
ch 'np/pac
k
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
r
g
e br
a
nch 'j
p
/
r
efs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Merge branch 'jc/qui
c
kfetc
h
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
branc
h
'maint'
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
Juni
o
C Hamano
lockfile: record the pri
m
a
ry
pr
o
cess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
c
o
n
vert
.
c: restructure
t
he
a
ttribut
e
check
i
n
g part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
am
a
no
Fix bogu
s
l
i
nked
-
list m
a
nagement for
u
ser defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
git-clone: fix d
u
mb protocol
tran
s
port to clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio
C
Ham
a
no
gi
t
-add
-u: match the index with workin
g
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
Document
gitattributes
(
5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
Update 'crlf'
a
t
tribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C H
a
mano
Docu
m
en
t
ation: support manual section (5) - file
f
ormats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
n
io C
H
amano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
mano
Simp
l
ify code t
o
f
ind
re
c
ursive m
e
rge
driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
H
a
man
o
Counto-fi
x
i
n
mer
g
e
-
re
c
ursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix fu
n
ny types u
s
ed in attribu
t
e value representation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
Hamano
Al
l
o
w
low-level driver to
s
pecify diffe
r
ent behavio
u
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Custom lo
w
-l
e
v
e
l
merge driver: change t
h
e
c
onfiguration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Ha
m
ano
A
llow the defaul
t
low-level merge driv
e
r to be confi
g
ured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Custom low
-
le
v
el me
r
ge driver s
u
p
p
ort
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Merge branc
h
'fl/cv
s
ser
v
e
r'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Merge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Upd
a
te draft r
e
leas
e
n
o
t
es for 1
.
5
.
2 with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C H
a
mano
Merg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io
C Hamano
Start preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Merge branch
'
master' of git://r
e
po
.
or
.
cz
/
git
-
gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch
'
maint
'
of git://r
e
p
o
.
or
.
cz/git-gui
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
u
ni
o
C Hamano
Merge branch 'jc/rea
d
-
tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
Add a
d
emonstr
a
t
ion/test of custo
m
iz
e
d merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
All
o
w specifying specializ
e
d
merge
-
ba
c
kend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Ha
m
ano
git-gui: Honor TCLTK_PAT
H
if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
merge-r
e
curs
i
v
e: se
p
arate
o
ut
x
dl_
m
erge(
)
interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next