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
Merge branch 'maint'
2007-04-27
J
unio
C
Hamano
Merg
e
b
ran
c
h 'maint
'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Start preparing for 1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Ju
n
i
o
C Hamano
Add --dat
e
=
{local,relative,defau
l
t
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
J
un
i
o
C
H
amano
Merge branch
'
jc/the-index'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Ha
m
ano
Merge branch
'mk/diff'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hama
n
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merg
e
b
ranc
h
'm
a
st
e
r' of git://repo
.
o
r
.
cz/g
i
t/f
a
stimport
commit
|
commitdiff
|
tree
2007-04-24
Junio
C Ha
m
ano
apply
m
box & quiltimport:
t
ypofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
gitattrib
u
te
s
d
ocumen
t
ation: cl
a
rify over
r
iding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C Ham
a
no
t/test-lib
.
sh: Protect ourselves
from co
m
mo
n
misconfig
u
ration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Diff between two blobs should take mode changes i
n
to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
unio C Hamano
Merge br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-24
J
unio
C
Hamano
Build RPM with ETC_GITCON
F
I
G=/etc/git
c
onf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ha
m
a
n
o
t6
0
30: g
r
ab commit obje
c
t
name a
s
we g
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C
Hamano
t5302: a
v
oid using tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Hamano
Document "
d
iff=dri
v
er" attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
n
io C Hamano
Make read
-
cache
.
c "the_index"
f
ree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
Move
index-related variables in
t
o a str
u
cture
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
S
u
pport 'diff=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ha
m
a
n
o
pa
c
k-o
b
j
ect
s
: mak
e
g
enerated packfile rea
d
-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ham
a
no
Update te
s
ts
n
ot to assume that generated packfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fi
x
'quickfix' on pack-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C Hamano
pa
c
k-objects
:
quickfix for permissio
n
modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
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
D
ocumentation/Makefile:
fix section (5)
i
ns
t
allation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o
C
Hamano
U
p
date 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
Jun
i
o C Haman
o
Mer
g
e b
r
anch 'lt/o
b
jalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Merge branch
'jc/add
'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
H
a
man
o
Merge
b
ranch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
m
ano
Merge bra
n
ch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Merge branc
h
'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge b
r
a
n
ch 'jp/ref
s
'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Merge bra
n
c
h '
j
c/
q
u
i
ckfetch
'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C
H
aman
o
Merge branch 'mai
n
t'
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
H
amano
lockfile: recor
d
the primary
p
r
ocess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C H
a
mano
convert
.
c
: restructure the attri
b
ute
chec
k
ing part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
amano
Fix bogus linked
-
list manage
m
e
n
t for user defined me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
gi
t
-clone: fix d
u
m
b
p
r
o
tocol tr
a
nsport to
c
lone
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
un
i
o C Hamano
git-add -u: match the
index
w
ith working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C
H
a
m
ano
Documen
t
g
i
t
attributes
(
5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
Upd
a
te 'crlf' attribut
e
semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
a
mano
Docum
e
nt
a
tion: suppo
r
t manual section (5) - file fo
r
mats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o
C Ha
m
ano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify code
to
f
ind recursive merge
d
ri
v
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hama
n
o
Cou
n
to-
f
ix in merge-recur
s
ive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merg
e
b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix
f
unny
t
yp
e
s used in attribute value representation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Allow
l
ow-leve
l
driver to s
p
e
c
ify
dif
f
erent be
h
a
v
i
our
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
uni
o
C
H
a
m
ano
Custom low-level
merge d
r
iver: chang
e
the confi
g
uration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C H
a
mano
Al
l
ow the default low-
l
evel
merge dri
v
er
t
o
be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom
low-level
merge driver suppor
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C Hamano
M
erge branch
'fl/cvsserver
'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C H
a
mano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
Hamano
Up
d
ate draft release no
t
es for 1
.
5
.
2 with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
M
e
r
ge br
a
nch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
Hamano
Star
t
prep
a
r
i
ng
for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge bran
c
h 'mas
t
er' of g
i
t://re
p
o
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
M
erge bran
c
h 'maint'
o
f git://re
p
o
.
or
.
cz/
g
it-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
M
erge branch 'jc
/
read-tree-d
f
'
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C
H
a
man
o
Add a dem
o
ns
t
ration/test of
c
us
t
omiz
e
d merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hama
n
o
Allo
w
s
pecifying
sp
e
cialized
merge-
b
ackend per pat
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o
C
H
amano
git-gui:
Honor TCLTK_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-recursiv
e
: separ
a
te out
x
d
l_mer
g
e()
i
nt
e
rface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
A
l
low more
t
han tr
u
e/false to attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C
H
amano
Make
sure qu
i
ckfet
c
h i
s
not f
o
oled w
i
th a prev
i
o
u
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Mer
g
e br
a
nch 'js/wrap
-
log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ha
m
ano
se
n
d-email: do not
l
eave an empty CC
:
line if n
o
cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ham
a
no
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C H
a
ma
n
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
a
mano
Change attribute nega
t
ion m
a
r
ker fro
m
'
!
'
to
'
-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Defi
n
e
a built-in a
t
tribute macro "bi
n
a
ry"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C H
a
mano
attribute macro supp
o
rt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
Makefile:
a
d
d pat
c
h-ids
.
h
back
i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
Fix '
d
iff
'
attribute
semanti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
io C Hamano
Fix
'
crlf' attrib
u
te s
e
mantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
a
no
Merge git://gi
t
2
.
kernel
.
org/pub/s
c
m
/
gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio 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
Def
i
ne '
c
rlf'
a
ttribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Ad
d
b
as
i
c infrastructure to a
s
sign attribu
t
e
s
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 Hamano
Replace
a
pair of p
a
tches with
u
pdat
e
d o
n
e
s
for subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
Do not
defau
l
t to --
n
o-inde
x
when give
n
two direct
o
ries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
a
mano
M
erge branch '
j
c/c
h
erry'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C
H
am
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C
Ha
m
ano
F
i
x
git {
l
og
,
show,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
Documentation
:
--cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C H
a
mano
git-log -
-
cherry-
p
ick
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C H
a
mano
Refactor pat
c
h-id
filterin
g
ou
t
of git-
c
herry and
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hama
n
o
Add %m t
o
'
--pr
e
tty=forma
t
:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
m
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio 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
f
sck:
d
o
not comp
l
ain
o
n det
a
che
d
HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merg
e
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C H
a
m
a
no
git-fe
t
c
h: us
e
fe
t
ch--tool
p
ick-rr
e
f to avoid
l
ocal
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
g
i
t-fe
t
c
h--tool pic
k
-rr
e
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hama
n
o
t3030: merge
-
recurs
i
ve
b
ackend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
m
a
no
merge
-
rec
u
rsive:
h
and
l
e D/F con
f
l
i
ct case m
o
r
e carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next