repo.or.cz
/
git
/
jnareb-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 'jc/the-index'
2007-04-25
Jun
i
o C Hamano
Merge branch 'jc/the-
i
n
d
ex'
commit
|
commitdiff
|
tree
2007-04-25
Juni
o
C Ham
a
no
Merge branc
h
'mk/d
i
f
f
'
commit
|
commitdiff
|
tree
2007-04-25
J
unio
C
H
a
mano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
M
e
rge branch 'master' of git://repo
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
applymbox
&
quiltimport:
t
ypofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
g
itat
t
ributes
doc
u
men
t
ation: clarify
o
v
erriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
unio
C
Hamano
t/test-lib
.
sh:
Protect
ours
e
lve
s
from co
m
mon misconfiguration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Diff betwe
e
n two blobs
s
hou
l
d
ta
k
e
m
ode chang
e
s into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o
C H
a
mano
Merge
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Haman
o
Build RPM w
i
t
h
ET
C
_GITCONFIG=/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 a
s
w
e
go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
H
a
mano
t530
2
: avoid using tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
ni
o
C Ham
a
n
o
Do
c
ument
"
diff=driver" attr
i
bute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Make
r
ea
d
-cac
h
e
.
c
"
t
h
e_
i
ndex"
free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
Ham
a
no
Move index-related variables int
o
a structure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C
Hamano
S
u
pport 'diff=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C Hamano
pa
c
k
-objec
t
s: make generate
d
packfile
re
a
d
-
only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
Update tests not
to assume that generated packfile
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
F
i
x
'
q
u
ickfix' on pack-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
a
n
o
p
ack-objects: qu
i
ckfix for permission m
o
de
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Ham
a
no
Up
d
ate draft release notes
f
or v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
Documentat
i
on/Make
f
ile: fi
x
section (
5
)
instal
l
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C
Hamano
Update d
o
cum
e
n
tation links to point at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
erge branch 'l
t
/objalloc
'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Ham
a
no
Merge bran
c
h 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge bran
c
h 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
branch 'lt/git
l
i
n
k'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge br
a
n
ch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C H
a
mano
Me
r
ge
branch 'jp/re
f
s'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge branch
'
jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C H
a
m
a
no
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Ha
m
ano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hama
n
o
lockfile: record the primary
proces
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C
Hamano
conv
e
r
t
.
c: restruct
u
re t
h
e attribute
c
heck
i
ng 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 manageme
n
t fo
r
us
e
r defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Ha
m
an
o
g
it-clone: fix dumb protocol
t
ransport t
o
clone
f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
git-add -u: match t
h
e i
n
dex with w
o
rking t
r
ee
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
Mer
g
e
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Hamano
Doc
u
ment gitattribute
s
(5
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o
C
Hama
n
o
U
p
date 'crlf'
attri
b
ute semantic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
D
ocume
n
tati
o
n: support manual s
e
ction (5
)
- fil
e
formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
n
i
o
C
Hamano
Merge br
a
n
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Haman
o
Simplify code to fin
d
re
c
u
r
sive merge
d
river
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
H
amano
Counto-fix in mer
g
e
-
re
c
u
r
sive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix f
u
nny types used in at
t
ribute v
a
lue representat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Ha
m
a
n
o
A
l
low low-
l
eve
l
dr
i
ver to sp
e
cify different behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C
Hamano
Cus
t
om lo
w
-l
e
vel merge driver: change
t
he configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow the
d
efault low-level
m
e
r
ge driver
t
o be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Custom low
-
le
v
el merge d
r
iver
s
uppo
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Me
r
ge branch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Mer
g
e b
r
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Updat
e
draft release
notes f
o
r 1
.
5
.
2 w
i
th a
c
c
umulat
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
a
mano
Start preparing fo
r
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge br
a
n
c
h '
m
as
t
e
r
' of git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
M
e
rge branch
'main
t
' of git://repo
.
or
.
cz/git
-
gui
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C H
a
m
a
n
o
Merg
e
branch 'jc/read-tree-d
f
'
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
aman
o
Add a demonstration/t
e
st of cus
t
omize
d
merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
Allow s
p
ec
i
fy
i
ng spec
i
aliz
e
d
me
r
g
e
-
back
e
nd
p
er
p
a
th
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
H
amano
git
-
g
u
i:
H
onor TC
L
TK_PATH if supplie
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Ha
m
ano
merge-recurs
i
ve
:
separate o
u
t
x
dl
_
merge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
l
l
o
w more than true/false to a
t
tribut
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
H
amano
Make
sure quickfetch is not fooled
wi
t
h a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
unio C
Hamano
Mer
g
e branc
h
'js/wrap-l
o
g'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
send-ema
i
l: do
not leave an e
m
pty CC: line
if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
i
o
C
H
a
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C H
a
m
ano
M
e
rge branch
'main
t
'
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C Hama
n
o
C
hange attribu
t
e n
e
g
a
tion marker fr
o
m '!' t
o
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
D
e
fine a built-in a
t
t
r
ibute macro "b
i
nary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
a
no
a
t
t
rib
u
te macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C H
a
ma
n
o
Makefile: ad
d
patch
-
i
ds
.
h
back
i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
i
o C Hama
n
o
Fix 'di
f
f' at
t
ribute sema
n
t
ics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Fix 'crlf' at
t
ribute s
e
mantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
M
e
rge gi
t
://git2
.
k
e
rnel
.
o
rg/pu
b
/scm
/
gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio
C
H
a
mano
Te
a
c
h
'
diff' about 'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
Def
i
ne 'crlf' attribu
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
A
d
d basic infrastruc
t
ure to assign a
t
tribut
e
s
t
o paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hama
n
o
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-14
J
u
ni
o
C Hamano
Replace a p
a
i
r
of patch
e
s
with updated ones for subprojec
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C
H
amano
Do not defaul
t
to --no-i
n
dex whe
n
given two
dire
c
to
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hamano
Merge b
r
anch 'jc/che
r
ry
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Me
r
g
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C
H
a
mano
Fi
x
git {l
o
g,show,
.
.
.
} --pretty=e
m
ail
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Ham
a
no
D
o
cumentation: -
-
ch
e
rry-
p
ick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
g
it-l
o
g --cher
r
y-pic
k
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Ref
a
ctor patch-id filteri
n
g out of git-cherry
a
nd git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
Add %m
to '--pre
t
ty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ha
m
ano
Merge
br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fsck:
d
o
not comp
l
a
in on detached
H
E
AD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
g
i
t-fetc
h
: use fetch--tool
pick-rr
e
f to avoid local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
git-fe
t
ch
-
-tool pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ham
a
no
t3030:
m
erge-recursive
b
a
ckend tes
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
i
o C
H
amano
m
e
rge-recursive: h
a
ndle D
/
F conflict ca
s
e
m
o
re carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C
Haman
o
mer
g
e
-re
c
ursive: do n
o
t barf on "to be removed" ent
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
Treat D/F
conflict e
n
try more carefully i
n
unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Ham
a
no
t1000: f
i
x c
a
s
e tabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
s
h
ort
l
og -w: m
a
ke wrap
-
line behaviou
r
optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next