repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t/test-lib.sh: Protect ourselves from common misconfiguration
2007-04-24
Junio C Hamano
t/test-lib
.
sh
:
Protect
o
urselve
s
from com
m
on
misconfiguratio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C
Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C Hamano
Build RPM
wi
t
h
ETC_GITC
O
NFIG=/e
t
c/gi
t
c
onfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
Ham
a
n
o
t6030: grab comm
i
t obj
e
c
t name as
w
e go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
t5302: avoid using tail
-c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Document "dif
f
=dr
i
v
e
r" attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
un
i
o C
Haman
o
Support 'di
f
f
=
pgm' attribu
t
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
i
o
C H
a
mano
pack-objects: make generated
packfile read-
o
nly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
U
p
d
at
e
tes
t
s not to assume that generated pac
k
files
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
H
amano
Fix 'quickfix'
on
pack-obj
e
c
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
p
ack-objec
t
s: qu
i
c
k
fix for per
m
iss
i
on modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
no
Upda
t
e draft
r
elease not
e
s for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Documentati
o
n/Make
f
i
le: fix sec
t
i
on (5)
installati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
m
a
no
Update d
o
c
umentati
o
n
link
s
to po
i
n
t
at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch
'l
t
/obj
a
lloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Merge
b
ran
c
h 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'jc/attr
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge branch
'
lt/
g
itlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Merge bran
c
h 'np/p
a
ck'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
M
e
rge branch
'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch
'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Merge b
r
anch '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 Hamano
lockfile: record
t
he prima
r
y proc
e
ss
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
H
ama
n
o
co
n
vert
.
c: restruc
t
ure the attribute checki
n
g part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
Fix bogus link
e
d-lis
t
management for u
s
er
d
efined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hama
n
o
git-clone: fix
dumb protoco
l
transport to clone
from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Ham
a
no
git-add
-
u: m
a
tch
t
he in
d
ex
w
it
h
wor
k
ing tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Ham
a
no
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
ama
n
o
Docu
m
e
n
t g
i
tattr
i
bu
t
es
(
5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ham
a
no
Upd
a
t
e 'crlf' attrib
u
t
e
semant
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio
C
Hamano
Documentati
o
n: su
p
p
o
rt
manual se
c
ti
o
n (5) - file f
o
rmats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify code
to find recursive merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io C Haman
o
Counto
-
fix i
n
m
e
rge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hama
n
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix fu
n
n
y types used in att
r
i
bute value represe
n
tation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
All
o
w
low-level dri
v
er to
sp
e
c
ify
d
ifferent
b
e
havi
o
ur
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
C
us
t
o
m
low-level merg
e
d
r
iv
e
r: cha
n
ge the con
f
i
g
uration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C
Hamano
Allo
w
the default l
o
w-
l
evel
m
e
rge dri
v
er
t
o
b
e
c
onfigured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Custom low-level
m
erge
d
river support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Merge branch 'fl
/
cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Merg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C
H
amano
Update draft release no
t
es fo
r
1
.
5
.
2 wit
h
accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hama
n
o
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
a
no
Start preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C Hamano
Mer
g
e bran
c
h 'master' of git://repo
.
or
.
cz
/
git-
g
u
i
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Merge branch 'maint' of git://repo
.
or
.
cz
/
git-gui in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Me
r
ge br
a
nch 'jc/read-tre
e
-d
f
'
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
A
d
d a demonstration/t
e
s
t
of customiz
e
d merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
n
o
Allow spec
i
fying sp
e
cializ
e
d merge-backe
n
d per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hama
n
o
git-
g
ui
:
Honor TCLT
K
_PA
T
H
if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merg
e
-r
e
cursive
:
separ
a
te out xdl_merge(
)
i
n
t
e
r
face
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Al
l
ow
m
or
e
th
a
n tr
u
e/false to
a
t
t
r
i
b
ute
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
am
a
no
Make sure quickfetc
h
is not
f
o
o
l
ed
w
ith a previ
o
us
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merg
e
branch 'js/
w
r
ap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
s
e
nd-
e
m
a
il: do not leave an empty CC: l
i
ne
if
no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Me
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C
Haman
o
Cha
n
g
e
at
t
ribut
e
negation
marker fr
o
m '
!
' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
D
e
fi
n
e a built-in
a
ttr
i
but
e
ma
c
ro "binar
y
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Haman
o
attribute macro supp
o
rt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile:
a
dd patch-i
d
s
.
h back
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio
C
Hamano
Fix
'
diff' attrib
u
te semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Fix 'crlf' attribute
s
e
m
antics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Ham
a
no
Merge git:/
/
git
2
.
kernel
.
o
r
g/pub/scm
/
g
i
t
k/gitk i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
T
e
ach 'diff' about 'diff' attr
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define 'crlf' attrib
u
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C Hamano
A
dd
basic infrast
r
u
ctu
r
e t
o
assign attributes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Replace
a
p
air of
p
atches with updated ones f
o
r
su
b
pr
o
ject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
ano
Do
n
ot default to --no
-
i
ndex when
given two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Ham
a
n
o
Merge branch 'jc
/
cherry'
commit
|
commitdiff
|
tree
2007-04-13
J
un
i
o C
H
a
mano
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio
C
Hama
n
o
Fix git {log,show,
.
.
.
} -
-
pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C
Ha
m
ano
Documentati
o
n: --ch
e
rr
y
-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
g
it-log -
-
cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
R
e
factor patch-id filte
r
ing out of git-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ham
a
n
o
Ad
d
%
m
to '--pre
t
t
y=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
H
a
m
ano
Merge b
r
anch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
G
IT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hama
n
o
fsck: do
not complain on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio
C Hamano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ham
a
no
git-fetch: use
f
etch--tool pick-
r
r
e
f
to avoid loc
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Haman
o
git-fetch--to
o
l pick-r
r
ef
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
t3030:
merge-recurs
i
ve backend tes
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merg
e
-recursive: handle D/F confl
i
ct case
m
o
r
e ca
r
efu
l
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
m
e
rge-recursi
v
e: do
not barf
on "to be r
e
moved"
e
ntries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Treat
D
/F conflict en
t
ry more car
e
fully in unpack-tr
e
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Ham
a
n
o
t1000: f
i
x
case ta
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hama
n
o
shortl
o
g -w: make w
r
ap-li
n
e beha
v
i
o
ur opt
i
onal
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
H
a
mano
Merge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
io
C
H
amano
Merge
b
r
an
c
h 'jc/me
r
ge-subtree
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Ha
m
ano
Merge bran
c
h
'js/fe
t
ch-pr
o
gress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Ha
m
a
n
o
Add Docu
m
entation/
c
md-li
s
t
.
made to
.
git
i
gnor
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C
Hamano
Star
t
1
.
5
.
2 cycle by
pr
e
pareing RelN
o
t
es f
o
r it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
m
ano
Me
r
ge bran
c
h
'
jc/read-tree-df'
(ea
r
l
y part)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
Prepare for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next