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-04-25
Junio C Ha
m
ano
Add 'filter' attr
i
b
ute and external filt
e
r dr
i
ver de
f
inition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Add 'ident' conversio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C
H
amano
Merge
b
ranc
h
'
j
c/t
h
e
-
in
d
ex'
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C Hamano
Merg
e
branch 'mk/di
f
f'
commit
|
commitdiff
|
tree
2007-04-25
Juni
o
C Ha
m
ano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-25
Junio
C Hamano
Merge
b
ranch 'master
'
of g
i
t://re
p
o
.
or
.
cz/
g
it/fastimport
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
i
o
C Hamano
applymbox & quiltimport: typ
o
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
gi
t
attributes docum
e
ntat
i
on: c
l
a
r
ify overriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t/test-lib
.
sh: Protect ours
e
lves from c
o
m
m
o
n misconfig
u
ration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C Hamano
Diff between t
w
o blobs sho
u
ld take mode chan
g
es
i
n
to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
M
erge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
i
o C
H
amano
Build
RPM with ETC_G
I
TCO
N
FI
G
=/e
t
c/gitconfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t6030: grab commit object
n
ame as
we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C
H
amano
t5302:
a
v
oid usi
n
g t
a
il -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
i
o
C
Hamano
D
o
c
u
ment
"
d
i
ff=
d
r
ive
r
" attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C Ham
a
no
Make r
e
ad-cache
.
c "t
h
e_in
d
ex"
f
ree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Jun
i
o
C
Hamano
Move index-related variab
l
es into a structur
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Ham
a
no
Sup
p
ort
'diff=pgm' att
r
ibute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ha
m
ano
pac
k
-obje
c
ts: mak
e
gen
e
ra
t
ed packfi
l
e read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hama
n
o
Update tests not to assume that generate
d
pack
f
iles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Fix 'quickfix' on pack-o
b
jects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C
Hama
n
o
pack-object
s
: qu
i
ck
f
ix for permission mod
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Upda
t
e draft release notes fo
r
v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hama
n
o
D
o
cumentation/Makefile: fix sect
i
on
(5) installatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update documentation links to point at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o
C Hamano
Merge branch 'lt/
o
bjalloc'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio
C Hamano
Merge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
Merg
e
branch 'jc
/
attr
'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Ha
m
ano
Merge
branch 'lt/gitlin
k
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio
C Hamano
Merge
branch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Mer
g
e
b
r
a
n
c
h
'
jc
/
quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C
Hama
n
o
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
mano
lo
c
kfile: rec
o
r
d
the primary proc
e
s
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
convert
.
c: restructure the attribute ch
e
c
k
i
n
g
part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
F
i
x bogus linked-list
m
anage
m
ent for user defined merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
an
o
git-clone: fix dumb
p
rot
o
col transpor
t
to clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C Hamano
git-a
d
d -u
:
match the
ind
e
x with working tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
n
io C Ham
a
no
M
e
r
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-20
J
unio C H
a
man
o
Document g
i
t
at
t
ributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
H
a
mano
Upd
a
te 'crlf' at
t
ribute
s
emantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
am
a
no
Documentation: support manua
l
s
ection (
5
)
- file
formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io C Haman
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Hamano
Simplify code to find recursive merge driv
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io C Ham
a
no
C
o
unto-fix
i
n merge-recursiv
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Haman
o
Merge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix fu
n
ny types
us
e
d in a
t
tribute
val
u
e
representa
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow low-leve
l
dri
v
e
r
t
o specify diffe
r
ent behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
ma
n
o
C
u
stom low-level merge driver: chan
g
e the config
u
rat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow the default
l
ow-l
e
vel merge driver to be
configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Custom l
o
w-level mer
g
e
d
river sup
p
ort
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C
Hamano
Merge
b
ranch
'
fl/cvsserv
e
r'
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o C
Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C
Hama
n
o
Update
draft release notes
f
o
r
1
.
5
.
2 with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
M
e
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
H
ama
n
o
S
tart
p
reparin
g
for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Merge br
a
nch 'ma
s
ter'
of git:/
/
re
p
o
.
or
.
cz
/
git-g
u
i
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Me
r
ge branch 'ma
i
nt'
o
f git://repo
.
or
.
cz/git-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Ham
a
no
Merge br
a
nch 'jc/read
-
tree-d
f
'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Add a demonstration/test of cu
s
t
o
m
i
zed
m
e
r
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
uni
o
C
Hamano
A
l
low
s
pecifyin
g
sp
e
ciali
z
ed merge-b
a
c
k
end
p
er path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
git-gui: Honor TCLTK_PATH i
f
supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
m
e
r
ge-recur
s
ive: separate out xd
l
_
m
erge() i
n
terf
a
ce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Haman
o
Allow mo
r
e
than true/f
a
lse to attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
Make sure
quickfetch is
not fooled with
a
pr
e
v
i
ous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Me
r
g
e
b
ra
n
c
h 'js/w
r
ap-log'
commit
|
commitdiff
|
tree
2007-04-16
J
un
i
o C
H
a
ma
n
o
s
end-em
a
il: do not
l
e
ave an em
p
ty C
C
:
l
in
e
if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Hamano
Mer
g
e
bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Ham
a
n
o
Cha
n
ge
a
tt
r
i
b
ute n
e
g
a
tion marker from
'
!' t
o
'
-
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Defi
n
e a bui
l
t-in
a
t
tribute macro "bi
n
ary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
attri
b
ute macro
support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ham
a
no
Makefile: add patch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
uni
o
C H
a
m
a
n
o
Fix 'diff'
a
ttribu
t
e
semantic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Fix '
c
rl
f
' a
t
tribute
s
ema
n
t
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
Merge git://
g
it2
.
kernel
.
org/pub/scm
/
gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
am
a
no
Teach 'diff'
a
b
out 'diff' att
r
ibute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define
'
crlf' attr
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add b
a
si
c
inf
r
a
s
tructure t
o
assign
attributes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
R
e
p
l
ace a pair of
p
a
tches
w
ith
updated ones for sub
p
rojec
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Hamano
Do not default
t
o --n
o
-index when given two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Haman
o
M
erge b
r
anch 'jc/che
r
ry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branc
h
'
main
t
'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hama
n
o
Fix git {log
,
sh
o
w,
.
.
.
} -
-
pretty=ema
i
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Documentation: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
g
it
-
log --cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C H
a
mano
Refactor patch-id filter
i
ng out of git-
c
h
erry
a
nd git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
A
dd %
m
t
o '--pretty=form
a
t:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
Merge branch '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
2007-04-11
J
unio C H
a
m
a
no
fsck: do n
o
t
compl
a
in on d
e
t
ached
H
E
AD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ham
a
no
M
e
rg
e
branch
'
m
a
int
'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
g
it-fetch:
u
se fetch--tool pick-rref to avoid loc
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hama
n
o
git-fetch--
t
ool pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
t
3030: merge-recu
r
sive
bac
k
end tes
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
mer
g
e-recursive:
h
andle D/F conflict case
more care
f
u
lly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
un
i
o C Hamano
mer
g
e-recu
r
sive: d
o
not barf on "to be re
m
oved" e
n
tries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Treat D/F
co
n
f
lict
e
ntry more carefully in unpac
k
-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next