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/
t
est-
l
i
b
.
sh: P
r
otect our
s
el
v
e
s
from common
misconfiguration
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C
H
a
mano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio
C
Hamano
Bui
l
d RPM
w
it
h
ETC_GITCONFIG=/etc
/
g
it
c
onfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t6030: grab commi
t
obj
e
ct
n
ame
as we
go
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
J
u
ni
o
C
Hama
n
o
t5302:
avo
i
d using tail -
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
ni
o
C Hamano
Document "dif
f
=
d
river
"
attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Support '
d
iff=pgm' attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Hamano
pack-objects:
make
generated packfile read-o
n
ly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
U
p
date tests not
to assume that generated packfiles
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Fix 'q
u
i
c
kfix
'
o
n
pack-
o
bjects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C Hamano
pack-obje
c
ts: q
u
ic
k
fix
for p
e
rmission modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
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
Junio
C
Hamano
Doc
u
mentation/M
a
kefile:
fix
sect
i
o
n (5) insta
l
lation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update documentation
links t
o
point at v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Merge branch
'
lt/obja
l
loc
'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io
C Hamano
Me
r
ge branch 'j
c
/add'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Ham
a
no
Merge branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Haman
o
Merge b
r
anch
'lt
/
gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o
C Hama
n
o
Merge b
r
a
nch
'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
a
n
o
Merge
branc
h
'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Merge bran
c
h 'jc/quick
f
etch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Merge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Haman
o
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o
C
Hamano
lockfil
e
:
record the prima
r
y process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
ano
co
n
v
ert
.
c: restru
c
t
u
re the
a
ttribute che
c
k
ing part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
Fix bogus li
n
ked-list
m
a
nag
e
ment for user define
d
merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
g
i
t-clone: fix dumb protocol t
r
anspor
t
to clo
n
e
f
rom
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Haman
o
g
it
-
add
-
u
: ma
t
ch the index with wo
r
k
ing tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
n
io C Ha
m
a
n
o
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Document gitattri
b
u
t
es(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Update 'crlf'
a
ttribute
semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Hama
n
o
Documentation: support
m
a
n
u
al sec
t
i
o
n
(5) - file forma
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
mano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-19
J
u
n
i
o
C H
a
mano
Simplify code
t
o find recursive merge dri
v
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Haman
o
Coun
t
o
-
fix i
n
me
r
g
e
-recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
man
o
F
i
x funny types
used in attribute
v
alue representat
i
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
a
m
ano
Allow low-
l
evel driver to specif
y
di
f
ferent beh
a
viour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low
-
leve
l
merge d
r
iver
:
change
the config
u
ration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow the default low
-
l
eve
l
m
e
r
g
e dr
i
ver to be
c
onfigured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Custom low-le
v
el me
r
ge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
M
e
r
ge branch 'fl
/
cv
s
server'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Me
r
g
e
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Ha
m
ano
U
pda
t
e draft
r
elease notes for 1
.
5
.
2
w
i
th accumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C
Ha
m
ano
M
e
rge branc
h
'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
St
a
rt preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Merg
e
b
r
anc
h
'
maste
r
' of
git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
n
o
M
e
r
ge b
r
anch 'm
a
int
'
o
f git://repo
.
or
.
c
z
/git
-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o
C Hamano
M
erge branch
'jc/re
a
d-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Haman
o
Add a demonstrati
o
n/test of customized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Allow spe
c
ifying s
p
ecialized merge-backend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
git-gu
i
:
Hon
o
r
T
C
LTK_PATH if supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
a
mano
merg
e
-recu
r
sive
:
s
e
pa
r
ate o
u
t xdl_merge(
)
inter
f
ace
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
Allow more t
h
an true/fals
e
t
o attribu
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make sure
q
u
i
ckf
e
tch is not fooled w
i
th
a
p
r
evious
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Me
r
g
e branch 'j
s
/wr
a
p
-
l
og'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Hamano
send-e
m
ail:
do
not
l
eave an empty CC: line if no
cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C H
a
mano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Haman
o
Me
r
ge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
J
unio C
H
a
mano
Change attribu
t
e negation mark
e
r
from '!'
to
'
-
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Define a built-in attribute macro "bina
r
y"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
a
mano
attribute macro suppor
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile:
a
dd patch-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Fix 'diff' attribute s
e
mantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hamano
Fix 'crlf' attribu
t
e semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Haman
o
Merge
g
it://
g
it2
.
kernel
.
o
r
g/
p
ub/s
c
m/gi
t
k/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Teach
'diff' abou
t
'
di
f
f'
attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
ano
Define '
c
rlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Add basic
i
nfr
a
struc
t
ure to assign attribu
t
es to path
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
ama
n
o
Replace a pair of patches with updated
o
n
e
s fo
r
subproje
c
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do
not default to --no-index
when given
t
wo d
i
rectories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C H
a
mano
M
erg
e
branch
'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Ha
m
ano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
Fix git {log,show,
.
.
.
}
-
-pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
Documentation
:
-
-
cherr
y
-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
git-lo
g
--che
r
ry-p
i
c
k
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
n
o
Refactor patch-id f
i
lt
e
ring out
of
git-ch
e
r
r
y
and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
Ad
d
%m to '
-
-pretty=format
:
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Me
r
ge branch
'maint'
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
Ha
m
an
o
fsck:
d
o not complain on detache
d
HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ha
m
ano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
a
mano
git-fetch
:
use fetch--tool pick-rref to avoid local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
g
i
t
-fetch--tool pick-rre
f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
i
o
C Hamano
t3
0
30: merge-recursiv
e
backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ham
a
no
m
erge-recursive: handle D/F confli
c
t
case mor
e
carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Ham
a
no
merge-recursive
:
do no
t
ba
r
f on "t
o
be rem
o
ved" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Treat D/F conflict entry more carefull
y
i
n
unpack-tree
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
an
o
t1000: fi
x
c
ase table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
shortlog -w: make wrap-li
n
e behaviour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Merge b
r
anch
'
jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge br
a
nc
h
'
j
c/m
e
r
g
e-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Merge bra
n
ch 'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
m
an
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Do
c
um
e
ntat
i
on/cmd
-
list
.
made to
.
git
i
gnore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 cycle by prepareing
R
e
l
Notes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
i
o
C H
a
mano
Merge branch 'jc/
r
ea
d
-tree-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Pre
p
are for
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next