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 'maint'
2007-04-24
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C
Hamano
Build
R
P
M wit
h
ETC_GITCONFIG
=
/etc/git
c
onfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C H
a
mano
t
6
0
30:
g
rab commit obj
e
ct name as w
e
g
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
no
t
5
3
0
2
: avoid u
s
ing tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Do
c
ume
n
t "
d
iff=driver" attribute
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
io C Hamano
pa
c
k
-
objects:
make generated pa
c
kfil
e
read-on
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
Update tests n
o
t to assume tha
t
generated packf
i
le
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hama
n
o
F
ix 'quickfix' on pack-o
b
ject
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C
H
amano
pack-objects: quickfix for pe
r
mission modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C
H
a
m
ano
Update draft release
notes for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
D
o
cumentation/Makefile: fix
s
ectio
n
(5) i
n
stallation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Upda
t
e documentatio
n
links
t
o point at v
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
branc
h
'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
b
r
anch
'jc/ad
d
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
M
e
rg
e
bran
c
h 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Merg
e
branch 'np/pack
'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C
H
amano
Merge
branch 'jp/
r
e
f
s
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
n
o
Merge branch
'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C
H
amano
lockfile
:
record the prim
a
r
y process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
un
i
o
C Hamano
conver
t
.
c:
r
es
t
r
u
ct
u
re
t
he attribute c
h
ec
k
i
ng
p
art
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
n
i
o
C H
a
mano
Fix b
o
gus lin
k
ed-li
s
t m
a
n
agement for user d
e
fined
m
erg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
git-clone: fix dumb
protocol tr
a
n
s
p
ort to
clone
from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
git-add
-
u: match the
i
ndex with
workin
g
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Docu
m
ent gitattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
Update
'crlf'
at
t
ribut
e
se
m
a
ntics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C
H
a
m
a
no
Document
a
tion:
s
u
p
port manual
se
c
tion
(5)
-
file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
n
io
C
Hamano
Merge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2007-04-19
Junio C
Hamano
Simplif
y
code to find rec
u
rsive merge
dri
v
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C
Hamano
Counto-f
i
x in merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Mer
g
e
branc
h
'maint
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Fix funny types used in attribute
va
l
ue repr
e
sentat
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
All
o
w low
-
l
ev
e
l dri
v
er to sp
e
cify differen
t
beha
v
iour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Cu
s
tom low-level merge
d
river: change the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Allow th
e
default low-level
merge driver to b
e
configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Cus
t
om low-level m
e
rge
d
river supp
o
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C
H
amano
Merge branc
h
'
f
l
/cvs
s
erve
r
'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C
Hamano
Me
r
g
e
br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Update draft rel
e
as
e
notes for 1
.
5
.
2 with
a
ccum
u
lated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
ama
n
o
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
S
t
a
r
t
pr
e
paring for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Merge branch 'master'
o
f git://re
p
o
.
or
.
c
z
/g
i
t
-
gu
i
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ham
a
no
Mer
g
e branch
'
maint' of git://repo
.
or
.
cz/git
-
gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Ha
m
a
no
M
erge branc
h
'jc/read-tree-
d
f'
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
A
dd
a
demonstra
t
ion/test of cu
s
tomized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Ham
a
no
A
llo
w
specifying
s
pecial
i
zed merge-backend per
path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio
C Hamano
g
it-gui:
H
onor TCLTK_PATH if supp
l
i
e
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io
C
H
amano
merge-recursive:
separate out xdl_
m
erge() inte
r
face
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
l
low mor
e
th
a
n true/false to attribut
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Make sure quickfetc
h
is not fooled with
a pr
e
viou
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Hamano
Merge branch
'js/
w
rap-log'
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Hamano
s
e
n
d-email: do not leav
e
an
e
mpty CC: li
n
e
i
f no
cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Hamano
Merge
b
ranc
h
'main
t
'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Cha
n
ge a
t
tribute negati
o
n marker from '!'
t
o '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Define a built-in at
t
r
ibute macro "binary
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
a
t
tribute macr
o
support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
Ma
k
efile: add patch-i
d
s
.
h back i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C Hamano
Fix
'diff' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Fix 'cr
l
f'
a
ttribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
un
i
o
C Ha
m
ano
Merge git://
g
i
t
2
.
kernel
.
o
r
g/pub/scm
/
gitk/gitk in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
io C Hamano
Teach 'di
f
f
'
about 'diff' attrib
u
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Defi
n
e 'cr
l
f' attribut
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Ad
d
basi
c
i
n
fras
t
r
u
c
ture to
assign attr
i
butes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Merge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C H
a
mano
Re
p
lace a pair of patc
h
es with u
p
dat
e
d
ones for subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
Do not defa
u
lt to
--no-index when given two dire
c
to
r
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Ham
a
no
Merge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Hamano
Fix git
{log,s
h
ow,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
Documentat
i
on:
-
-cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C
H
aman
o
g
it-
l
og -
-
cherr
y
-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor patch
-
i
d
filtering o
u
t of git-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
A
dd %m to '--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hama
n
o
Merge branch '
m
a
int'
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C
Ham
a
n
o
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 complain
o
n
detached HE
A
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
Mer
g
e
b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C
H
amano
git-fetch
:
u
se fe
t
ch--tool p
i
c
k-rref to
a
v
oid local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
g
it-fetch--t
o
ol pi
c
k-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t3030: me
r
ge-recursi
v
e
b
a
ckend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
m
erge
-
r
e
c
ursive: handle D/F conflict
case more careful
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C H
a
mano
me
r
ge-rec
u
rsi
v
e: do not barf o
n
"to be remov
e
d
"
entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Treat D/F c
o
nflict entry more carefully in unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
t1000: fix case ta
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
H
amano
shortlog -w: make
w
rap-line behaviour optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
i
o C H
a
m
ano
Merge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
io C
H
a
mano
Merge b
r
anch 'jc/merg
e
-su
b
t
ree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Merge bran
c
h
'
js/fetch-p
r
o
gress
'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C
Ha
m
ano
Add Documentati
o
n/cmd-list
.
made t
o
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hamano
Start
1
.
5
.
2 cycle by p
r
epareing
RelNote
s
for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
M
er
g
e
branch 'j
c
/
r
ead-tree-df' (early par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Me
r
ge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
ano
Prepare for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new me
r
ge s
t
ragety 's
u
btree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next