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
gitattributes documentation: clarify overriding
2007-04-24
Junio
C H
a
mano
gitattributes documentation:
c
l
a
rify overriding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C
H
amano
t/test-lib
.
sh: Protect ourselves from common mis
c
onfiguration
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
Me
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C
Ham
a
no
Buil
d
RPM with E
T
C_GITCONFIG=/etc/
g
i
tconfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C Ha
m
ano
t6
0
3
0: grab commit object name as we go
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t53
0
2: avoid using
tail -c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Hamano
Document "
d
iff=d
r
i
v
e
r" a
t
t
ribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C H
a
mano
Suppo
r
t
'diff=pgm' attribu
t
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C Hamano
pack-objects: make generate
d
packfile rea
d
-
o
nly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C Hamano
Update t
e
sts not to as
s
ume that
g
enerated packfiles
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Fix 'quic
k
fi
x
' o
n
pack-obj
e
cts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hama
n
o
pack-obje
c
ts
:
quickfix for permis
s
io
n
mo
d
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C
H
amano
Upda
t
e dr
a
ft release notes for v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Documentation/Makefile: fix se
c
tion (
5
) insta
l
lation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
ni
o
C
Ham
a
no
Update d
o
cumentation links to p
o
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
Me
r
ge
branch '
l
t/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Mer
g
e bran
c
h 'j
c
/
a
dd'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
M
e
rge branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
erge branch
'lt/g
i
tl
i
nk'
commit
|
commitdiff
|
tree
2007-04-22
J
u
ni
o
C Hamano
Merge bran
c
h
'
np/pac
k
'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
M
e
r
g
e branch
'
jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C
Ha
m
ano
M
erge branch 'j
c
/quick
f
etch'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C
H
a
mano
M
erge bran
c
h '
m
ain
t
'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Haman
o
GI
T
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
lockfile: record the prima
r
y
process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Hamano
c
o
nvert
.
c: re
s
tr
u
c
t
u
r
e the attribute checking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Ham
a
no
Fix bogus
l
inked-list management
f
or us
e
r
d
ef
i
ned merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Hamano
git-clo
n
e
:
fix d
u
mb protoc
o
l transp
o
rt to c
l
one from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Hamano
git-add -u: match th
e
index with
w
orking tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Document g
i
tattr
i
butes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Haman
o
Update 'crlf' attribu
t
e semanti
c
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C H
a
mano
Documentation: support manua
l
sec
t
ion
(5)
-
file fo
r
mats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Sim
p
lif
y
code to
f
ind
re
c
ursive
merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C Ha
m
ano
Counto-fix in merge-r
e
curs
i
ve
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hama
n
o
Merge b
r
anc
h
'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
F
i
x fu
n
n
y
ty
p
es used in attribute value
represe
n
t
a
t
i
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Allow low-level
d
r
i
ver to specify differ
e
nt behav
i
our
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Custom
low-level merge driver: chang
e
the
configurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C H
a
m
a
no
Allo
w
the default low-level merge
d
river
to be
co
n
figu
r
e
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Ham
a
n
o
Custom l
o
w-level merge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
ni
o
C
Hamano
M
erge branc
h
'fl/cvsser
v
er'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
Hamano
Merge branch
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Update draft rel
e
a
se notes for 1
.
5
.
2 w
i
th a
c
cumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
M
erge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
S
tart pre
p
aring for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Merge bra
n
ch 'master' o
f
g
it://repo
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ham
a
no
Merge
b
ran
c
h 'ma
i
nt' of
git://repo
.
or
.
cz/git-gui i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
M
erge bra
n
ch 'jc
/
read-t
r
ee-df
'
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
A
d
d a demons
t
ration/test of customized me
r
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Al
l
ow speci
f
y
i
n
g
s
pecialized merge-ba
c
kend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
a
m
a
no
git-g
u
i: Honor TCLT
K
_PATH if supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-recurs
i
ve: sep
a
rat
e
out xdl_merge() inte
r
face
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C
Hama
n
o
A
llo
w
more than tru
e
/
f
al
s
e to attribu
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Haman
o
Make sure quickfetch is not
fooled with
a
previ
o
us
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Ha
m
ano
Me
r
ge
branch
'
j
s/wrap-
l
og'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
s
end-
e
m
ail: do not
leave an empty CC: line
i
f no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
J
unio
C Haman
o
Chan
g
e attribute
negation ma
r
ker from '!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Define a bu
i
lt-in attribute macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
attri
b
ute macro suppo
r
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
H
amano
Makefi
l
e: add pa
t
ch-ids
.
h
back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
man
o
Fix
'
diff' attribute s
e
man
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C
H
a
mano
Fix
'
crlf'
attribute seman
t
ic
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Merge git
:
//git2
.
kernel
.
org/pub/scm/gitk
/
gitk
int
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Te
a
ch '
d
iff' about 'diff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define '
c
r
lf
'
a
ttribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
Hama
n
o
Add
bas
i
c infra
s
truc
t
ure t
o
assi
g
n
at
t
ributes t
o
paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Ham
a
n
o
Merge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Hamano
Replac
e
a
pair of patches wit
h
updat
e
d
ones
f
or su
b
project
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do
not default to --no-i
n
dex when given two direct
o
ries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C
Hamano
Merge branch 'jc
/
cher
r
y'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Haman
o
Merge b
r
anch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o
C Haman
o
Fix git
{
l
o
g,s
h
ow,
.
.
.
}
-
-pre
t
ty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C
Ha
m
ano
D
o
c
umentation: --c
h
erry-pi
c
k
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
git-log --cher
r
y
-
pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Ha
m
a
no
R
e
factor patch-id filtering out of git-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Add
%m to
'--pretty
=
format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fs
c
k: do not
complain on detached
H
EAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C
Ha
m
ano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
ama
n
o
git-fe
t
ch: u
s
e fetc
h
--tool pic
k
-rr
e
f
to avoid
l
o
cal
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio
C
Ha
m
ano
git-fet
c
h--to
o
l
pi
c
k-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t30
3
0:
m
erge-
r
ecursive backen
d
test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Ha
m
ano
merge-
r
ecursiv
e
: handle D/F
conflict case m
o
re
c
ar
e
fully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
me
r
ge-re
c
ur
s
i
v
e: do not barf on "t
o
be removed" entrie
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
T
r
eat
D
/F conflic
t
e
ntry more car
e
full
y
in un
p
ack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
t1000: fix case t
a
ble
.
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 wr
a
p
-
l
i
ne
behaviour opt
i
onal
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
unio C
Hamano
Merge bra
n
ch 'jc/push
'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Mer
g
e branch 'jc
/
m
e
rge-s
u
btree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
erge branc
h
'
js/fetch
-
progress'
commit
|
commitdiff
|
tree
2007-04-09
J
uni
o
C Ham
a
no
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Add Docum
e
ntation/cmd-lis
t
.
ma
d
e 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 p
r
epa
r
ei
n
g
R
elNotes fo
r
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hamano
Merg
e
bra
n
ch 'jc/read-tree-df' (early p
a
rt)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
i
o C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
next