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 branch 'maint'
2007-04-27
Junio C Hamano
Merge bran
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Jun
i
o C
H
a
m
a
no
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 --dat
e
={loc
a
l,relative
,
d
e
f
ault}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Jun
i
o
C Haman
o
Merge branch 'jc/t
h
e-index'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hama
n
o
M
e
rge
bran
c
h 'mk/diff'
commit
|
commitdiff
|
tree
2007-04-25
Junio C H
a
man
o
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branc
h
'mas
t
e
r'
of git://repo
.
or
.
cz/
g
it/fast
i
m
port
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
app
l
ymbox & qu
i
lti
m
port: typo
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Haman
o
gitattributes doc
u
mentation:
c
l
a
rify overr
i
ding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
Hamano
t/test-li
b
.
sh:
Pr
o
t
ect ourselv
e
s from
c
o
mmon misconf
i
g
u
r
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Di
f
f between
two blobs shoul
d
t
ake m
o
de change
s
into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-24
Junio C H
a
mano
Build
RPM with ETC_GI
T
CONFIG
=
/
etc/gitconfi
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ha
m
a
n
o
t
6
030
:
grab
com
m
it object
name as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C
H
am
a
n
o
t5302: avoid using tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
uni
o
C Hamano
Docume
n
t
"
diff=dri
v
e
r
"
a
t
t
ribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
M
a
ke read-cache
.
c "the_index" free
.
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 Ha
m
ano
Sup
p
o
r
t
'diff=pg
m
' a
t
tribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C
H
amano
pack
-
o
b
jects: make
generate
d
packfile
r
ead
-
only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Ham
a
no
Update tests
n
ot to assume that generated
p
ack
f
iles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
Fix
'
q
uic
k
fix' on pac
k
-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
Hamano
pack-objects: quickfix fo
r
permission
m
odes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Up
d
ate dr
a
ft rele
a
s
e not
e
s for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
D
o
cumentation/Mak
e
file: fix se
c
tion (5) i
n
stallation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C
Ham
a
no
Update docu
m
en
t
ation l
i
nks 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
Ham
a
no
Merge branch 'lt
/
objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
Merge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge branch 'jc/a
t
tr'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Merge branch '
l
t/g
i
tli
n
k
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
no
Merge branc
h
'n
p
/pack'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C H
a
mano
Merge branch 'jp/refs
'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C
Hamano
Merge branch
'j
c
/quickfe
t
c
h
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
m
ano
M
e
r
g
e
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
Junio C Ham
a
no
l
ockfile:
r
ecord the prim
a
ry
pr
o
c
ess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hamano
conv
e
rt
.
c
:
restructu
r
e
the attribute checking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
amano
Fix bogus li
n
ked-list
mana
g
ement for user define
d
me
r
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Hama
n
o
gi
t
-clone: fi
x
dumb
protocol transpor
t
to c
l
on
e
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Hamano
git-
a
dd -u: match the
index with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C
Haman
o
Merg
e
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 'cr
l
f' att
r
ibute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
Documentatio
n
: sup
p
ort ma
n
ual sec
t
ion (5) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
uni
o
C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio
C
Hamano
Simp
l
ify
c
o
de to
f
ind r
e
cu
r
s
i
ve merg
e
dri
v
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
unio
C
H
a
mano
Cou
n
to-fi
x
in
m
e
rge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o C Haman
o
M
er
g
e branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix funny types us
e
d in attrib
u
te v
a
lue
representation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Ha
m
ano
A
l
l
o
w low-
l
evel dr
i
ve
r
to specify
d
ifferent behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custo
m
low-level
merge driver: change the c
o
nfiguration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow the defaul
t
low-level me
r
g
e
driver
to be c
o
nf
i
gured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level merge driver
support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o C Hamano
Merge
b
ranch 'fl/cv
s
s
erver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Mer
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Up
d
ate dr
a
ft
rele
a
se no
t
es for
1
.
5
.
2
w
i
th accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C Hamano
Start pre
p
aring f
o
r 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C Hamano
Mer
g
e
b
ranch 'master' of
g
it://repo
.
o
r
.
cz/
g
i
t
-
gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge b
r
anch 'maint'
of git://r
e
po
.
or
.
c
z
/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Haman
o
Merge bran
c
h 'jc/re
a
d
-tree-df
'
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Ham
a
no
Add a
demons
t
r
a
t
ion/test o
f
cu
s
to
m
ize
d
merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
Allow specifying sp
e
c
ialized merge-
b
a
c
k
end p
e
r path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
git-gui: Ho
n
or
T
CL
T
K_PATH if suppl
i
e
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
Hamano
merge-recursive: separ
a
te out xdl
_
me
r
ge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hama
n
o
Allow more than true/false to a
t
trib
u
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C
Hamano
Make sure quickfet
c
h is
n
ot fooled with a previo
u
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C H
a
mano
Merge branc
h
'
js/w
r
a
p
-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Hamano
send-e
m
ail: do not leave a
n
em
p
ty CC: li
n
e
i
f no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
un
i
o C Hamano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o
C Hama
n
o
Merg
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Cha
n
ge
a
ttri
b
u
te negation m
a
rker from '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
m
a
no
Defin
e
a bui
l
t-
i
n
at
t
ribu
t
e macr
o
"binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
attribute macro sup
p
ort
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile
:
add patch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
i
o C H
a
man
o
Fix 'diff
'
attribu
t
e
sem
a
ntics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Haman
o
Fix 'crlf' attribut
e
semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Me
r
g
e
git:/
/
git2
.
kern
e
l
.
org/pub/scm/gitk/gi
t
k
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Tea
c
h
'
diff' about '
d
iff' a
t
tribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
D
e
fine 'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
ama
n
o
Ad
d
basic infrastructure to ass
i
g
n a
t
tribu
t
e
s
to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Replace
a
pair of patches with u
p
d
a
te
d
ones
f
o
r subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
Do not d
e
fault
t
o --
n
o
-ind
e
x when given
t
wo directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ham
a
no
M
e
rge branch
'
j
c/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
M
erg
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git {log,show,
.
.
.
} --pretty=em
a
il
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
i
o
C Hamano
Documentation: --che
r
r
y
-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
i
o
C H
a
mano
git-log --cherr
y
-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C H
a
m
ano
R
e
factor patch-
i
d
f
il
t
ering out of git-cherry a
n
d git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
A
d
d %m to '--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
M
e
r
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ha
m
ano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C
H
amano
fsc
k
:
do not complain on de
t
ach
e
d HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
g
i
t-
f
etch: use fetch--tool pick
-
rref
t
o avoid lo
c
al
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
io C Haman
o
gi
t
-fetc
h
--tool pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
Hamano
t3030: me
r
ge-recursive backe
n
d test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
merge-recursive: handle D/F c
o
n
f
l
i
ct case more carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next