repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge commit 'gfi/master'
2007-04-29
Junio
C
Hama
n
o
Me
r
ge commit 'gfi/master'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Me
r
ge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-29
Junio
C Ha
m
ano
Fix im
p
ort-tar
s
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C Hamano
Upd
a
te
.
m
ailmap
with "
M
ic
h
ael
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
H
amano
D
o no
t
bar
f
on
too long action d
e
scription
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
M
e
rge branch 'maint' of
gi
t
://repo
.
or
.
c
z
/git
/
fastimpo
r
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Junio C Ha
m
ano
Merg
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C
H
aman
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio
C
Hama
n
o
Start pre
p
aring for
1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Junio C
Ha
m
ano
Add --
d
ate={local,rela
t
i
v
e,default}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
J
u
n
i
o C Ha
m
ano
Merge branch 'jc/the-index'
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C Hamano
Merge br
a
n
c
h
'mk/d
i
ff'
commit
|
commitdiff
|
tree
2007-04-25
Junio C
H
aman
o
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-25
Juni
o
C Hamano
Merge branch 'master'
of
git://repo
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
applymbox & q
u
ilt
i
mport: typ
o
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
gitattributes docum
e
ntation: clarify ove
r
riding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t/te
s
t-l
i
b
.
sh:
Prote
c
t
o
urselves from common misc
o
n
f
iguration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C H
a
mano
Diff betwee
n
two blobs should take mode changes into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
n
o
Merge b
r
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C
Hamano
Build
RPM with ETC_GITCONFIG=/etc/g
i
tc
o
nfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C
H
a
m
ano
t6030: grab commit ob
j
ect nam
e
as we g
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
H
amano
t5302: av
o
i
d using
tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Jun
i
o
C
H
a
mano
Document "diff=d
r
iv
e
r" 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
he
.
c "t
h
e_index
"
free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C Hamano
Move index-re
l
ated variables into a structure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
Support 'diff=pgm' attr
i
bute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
ama
n
o
pac
k
-o
b
jec
t
s: make generat
e
d packfi
l
e
read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Up
d
ate tes
t
s not to assu
m
e that g
e
nerat
e
d packfil
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
Fi
x
'quickfix' on
pack-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hama
n
o
pack-o
b
jects: qui
c
kfi
x
for permission modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
i
o C Hama
n
o
U
pdate draft release
n
o
t
es fo
r
v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Documentation
/
Makefil
e
: fix sec
t
ion (5) installati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update d
o
cumentation link
s
to point at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
uni
o
C H
a
m
ano
Mer
g
e branch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Ham
a
no
Merge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Ham
a
no
Merge branch 'jc/
a
tt
r
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branc
h
'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
b
r
anch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
M
erge branc
h
'jp/ref
s
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'jc/quick
f
etch'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Merge
b
ranc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
ano
G
IT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
Hamano
lockf
i
l
e: record the
primary pro
c
e
ss
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
n
i
o C H
a
man
o
convert
.
c: r
e
structure the attri
b
ute
checking
part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
Haman
o
Fix bogus li
n
ked
-
li
s
t manage
m
e
n
t
for user defin
e
d me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
git-clo
n
e: fix
dumb proto
c
ol transport to clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C
H
amano
gi
t
-
a
dd -
u
:
matc
h
t
he
i
n
d
e
x
with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
H
a
mano
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-20
J
unio C Hamano
Document gitattri
b
utes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Haman
o
Update
'
crl
f
'
attribute s
e
m
ant
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C H
a
mano
Docu
m
e
n
tation:
support manual sec
t
ion (5) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Hamano
Me
r
g
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C Hama
n
o
Simplify cod
e
to find
recursive me
r
ge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio
C
Ha
m
ano
Counto-fix
i
n
merge-recu
r
siv
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Merg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix fun
n
y
types used in attribute value represent
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Ha
m
an
o
Allow low-le
v
el d
r
iver to s
p
ecify different beh
a
v
i
our
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C Hamano
Cus
t
om low-lev
e
l merge driver: change
t
he
c
on
f
igur
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C H
a
mano
Allow
the default
l
ow-level me
r
g
e driver to be
c
onfigured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C H
a
man
o
Custom low-level
m
erge driver s
u
p
p
o
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Merge branch 'fl/cv
s
server'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C H
a
m
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Update draft release n
o
tes fo
r
1
.
5
.
2 with accum
u
lat
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Start preparing
f
or 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C
H
amano
Merg
e
br
a
nch
'm
a
ster' of git://r
e
po
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Ha
m
ano
Merge bran
c
h
'm
a
int' of git://repo
.
o
r
.
cz/
g
it-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
Merge branch
'jc/read-tree
-
df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
A
dd
a
dem
o
nstration/tes
t
o
f c
u
s
tomized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow specifyin
g
sp
e
ci
a
lized me
r
ge
-
backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
git-gui: Hon
o
r TCLTK_
P
A
TH if
s
u
p
plied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
m
erge-recursi
v
e: separate out xd
l
_m
e
rge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Ham
a
no
A
l
low more than true/false
to at
t
ributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
Make sure q
u
ickfetch is not fooled with a pr
e
vious
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C H
a
m
a
no
M
e
rg
e
b
r
anch
'
js
/
wrap-lo
g
'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Ha
m
a
n
o
send-email: do
not leave an empt
y
C
C
: line
if n
o
cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merg
e
br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C
H
am
a
n
o
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
Change attribute negatio
n
marke
r
from
'
!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Define a built-in a
t
tribute macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
a
t
tribute macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile: add pat
c
h-
i
ds
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix
'
diff
'
attribute s
e
m
a
ntics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hama
n
o
Fix
'crlf' attribute
s
emantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hamano
Mer
g
e git://g
i
t2
.
kernel
.
or
g
/pub/s
c
m/gitk
/
gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o C Ha
m
ano
Teach
'di
f
f
'
about 'diff' at
t
ribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Ha
m
ano
Define 'crlf' attr
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Add basic
i
nfrastru
c
ture to assign attri
b
utes to pa
t
hs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Merge
branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Ham
a
no
Replace a pai
r
of pa
t
ches
w
i
t
h updated
ones f
o
r su
b
pro
j
e
c
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
Do not default to --no-index when given
two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
M
erge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Ham
a
no
F
ix git {log
,
show,
.
.
.
}
-
-pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ha
m
ano
Docume
n
ta
t
ion: -
-
cherry
-
pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
g
i
t-log --
c
herry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Ha
m
ano
Refactor p
a
tch
-
id f
i
ltering out of g
i
t-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hama
n
o
Add %
m
to
'
-
-
p
retty
=
format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Mer
g
e
bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next