repo.or.cz
/
alt-git.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
Juni
o
C H
a
m
a
no
gitattri
b
ute
s
documenta
t
i
o
n: cl
a
rify
o
verr
i
ding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C Hama
n
o
t/test-lib
.
sh: Protect ourselves from
c
o
mmo
n
mis
c
onfig
u
rat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Build RPM wit
h
ETC_GITCONFIG=/etc
/
gitconfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Haman
o
t6030:
grab com
m
it objec
t
name as
we
go
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C
H
amano
t5302: a
v
oid u
s
ing tail -c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Hama
n
o
Document "
d
iff=driver" attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C H
a
m
a
no
Support
'diff=pgm' attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
H
a
m
a
no
pac
k
-objects: ma
k
e generated p
a
c
kf
i
le r
e
ad-onl
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ha
m
ano
Up
d
at
e
tests n
o
t
t
o assume tha
t
g
ener
a
t
ed p
a
ckf
i
l
es
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Fix 'qui
c
k
f
ix' on pack-
o
bjec
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
p
ack-objects: quickfix for permission modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update
d
r
a
ft re
l
ease notes for v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Docum
e
ntation/Makefile: fix
sec
t
ion
(
5
)
installatio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
io C Hamano
Update d
o
cumentation l
i
nks to
p
oint at v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C
Haman
o
Merge b
r
anch '
l
t/objal
l
oc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
Merge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Merge branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C
Hamano
Merg
e
branch 'lt
/
gitl
i
nk'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
Merge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
M
erge bran
c
h
'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
m
a
n
o
M
erge b
r
an
c
h 'jc/quickfetc
h
'
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C Hamano
Me
r
ge br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-21
J
u
n
i
o
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 the primary process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C H
a
m
a
no
convert
.
c
: restr
u
ct
u
re the attrib
u
t
e c
h
eck
i
ng p
a
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
F
i
x
b
ogus linked-
l
ist ma
n
agemen
t
f
o
r
u
ser defined merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Haman
o
git-clo
n
e: fix du
m
b protocol tran
s
port t
o
clo
n
e from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Ham
a
no
git-ad
d
-u: match the index with
wor
k
ing tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Do
c
ument gitat
t
ributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Update '
c
rlf' attribute se
m
ant
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Hamano
Documentation: support
m
a
nua
l
section
(5)
-
file formats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify co
d
e
to find re
c
ursive merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
C
o
unto-fi
x
i
n
merge-r
e
cursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Merge branch '
m
a
i
nt
'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
H
am
a
n
o
F
ix funny ty
p
es used in
a
ttribute
v
alue re
p
resen
t
ati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ham
a
no
Allow low-
l
evel driver to specify different behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hama
n
o
Custom low-leve
l
merge driver: change the configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ha
m
a
no
Allow the d
e
fault low-level merge driver
t
o be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Cu
s
t
o
m
low-le
v
el merge driv
e
r
support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Me
r
g
e
b
r
a
n
ch 'fl/c
v
s
ser
v
er'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Update
d
r
a
ft release notes for 1
.
5
.
2 with
accumula
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
erge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Ham
a
no
S
t
a
r
t preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ham
a
no
Me
r
ge branch '
m
aster' of git://r
e
p
o
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Mer
g
e branch 'mai
n
t' of git
:
//repo
.
or
.
c
z
/git
-
gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
Merge branch 'jc/read-tree-d
f
'
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
A
d
d a demonstr
a
tion/test of customized me
r
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow s
p
ecif
y
ing s
p
ecia
l
i
z
e
d
mer
g
e
-
backend
p
er
p
ath
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
git
-
gui: Hon
o
r
T
CL
T
K_PA
T
H i
f
supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-recursive: se
p
arate
o
ut
x
dl_merge
(
) interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
Allow more than true/false to
a
ttributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
io
C
Ham
a
no
Make
sure
q
u
ickfetch
i
s not fo
o
led wi
t
h a previ
o
us
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C
H
ama
n
o
Merge branc
h
'js/wra
p
-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
a
m
a
no
send
-
email: do
not lea
v
e an emp
t
y
CC:
l
ine
i
f no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Mer
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
n
o
C
ha
n
ge attribut
e
n
egation mark
e
r
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 attrib
u
t
e macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
attribute macro supp
o
rt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o
C Haman
o
Makefile: ad
d
p
atch-
i
ds
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'diff' attribute
s
emant
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
i
o
C Haman
o
Fix 'crlf' attribute se
m
antics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Merge git://gi
t
2
.
kernel
.
org/pub/scm/gitk
/
gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
T
each 'diff'
a
bout 'diff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Define 'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Add basic infrastructure
to assign
attributes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
ma
n
o
Replace
a pair
o
f patches with update
d
one
s
for
subpro
j
ect
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Do not d
e
fault
t
o --no-index
w
hen gi
v
e
n
two
d
irectories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Ha
m
ano
Merge branch 'jc/c
h
erry'
commit
|
commitdiff
|
tree
2007-04-13
J
un
i
o C Hamano
M
e
rge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
uni
o
C Hamano
Fix
g
it
{log,show,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
D
ocum
e
nta
t
i
on: --ch
e
r
ry-pi
c
k
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio
C
H
ama
n
o
git-l
o
g
-
-
cherry-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 out of git-
c
herry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '-
-
pre
t
ty=f
o
rmat:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merg
e
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 Hamano
fsck:
d
o not c
o
mplain
o
n detach
e
d
HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
M
e
rge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
gi
t
-fetch: use
f
e
tc
h
--tool pi
c
k-
r
re
f
t
o
av
o
id local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
io C Ha
m
a
no
git-fetch--tool pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
t
3
0
3
0
:
merg
e
-r
e
cursive backend te
s
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merg
e
-recursiv
e
:
h
andle D/F conflic
t
cas
e
more carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ha
m
ano
me
r
ge-recursive: do not barf on "to b
e
remo
v
e
d
" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
un
i
o C Hamano
T
reat D
/
F conflict entry more ca
r
e
full
y
in unpa
c
k-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ham
a
no
t1000: fix c
a
se table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
sh
o
rt
l
og -w: make wrap-line behaviour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Mer
g
e
bra
n
ch 'jc/pu
s
h
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
M
e
r
ge branch 'jc/merge-subtr
e
e'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Ham
a
n
o
Merge branch 'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Ham
a
no
M
erg
e
branc
h
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Documentation/cmd-list
.
made
to
.
giti
g
nore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 cyc
l
e by pr
e
p
areing RelNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
Merge b
r
a
nc
h
'jc/read-tree-
d
f' (early par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Haman
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
next