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
Junio C
H
a
m
a
no
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Haman
o
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Ham
a
no
Start preparing for 1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
A
d
d -
-
date={local,
r
elative,
d
efau
l
t
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch
'
jc/the-index'
commit
|
commitdiff
|
tree
2007-04-25
Junio C
Hamano
Me
r
ge branch
'
m
k/d
i
ff'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
M
e
rge
bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch
'
m
a
ster'
o
f git://repo
.
or
.
cz/
g
it/fastimp
o
rt
commit
|
commitdiff
|
tree
2007-04-24
J
unio C H
a
m
a
n
o
applymbox & qu
i
lt
i
mport:
typofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
gitattribu
t
es doc
u
mentation: clarify
o
ver
r
i
d
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C H
a
mano
t/test-lib
.
sh: Pr
o
tect ourselves
fr
o
m
common misconfiguratio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Diff between two blo
b
s
s
hould take mod
e
changes in
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C
H
amano
Merg
e
branch
'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Build RPM wit
h
ETC_GITCONFIG=/etc
/
gi
t
con
f
ig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C Hamano
t
6
030:
grab comm
i
t o
b
j
e
ct name as we
g
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
unio C Hamano
t5302
:
avoid
u
sin
g
tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C Hamano
Docu
m
ent "diff=d
r
iv
e
r" attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Jun
i
o C
H
amano
Make r
e
ad-cache
.
c
"the_index" free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C Ham
a
no
Move index-related va
r
iables into a structure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Support 'dif
f
=pgm
'
attri
b
ute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C H
a
mano
p
ack-o
b
j
ects: make gen
e
ra
t
e
d
p
a
ckfil
e
rea
d
-o
n
ly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Upd
a
te tests n
o
t to assume that
generated p
a
ckfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io
C
Hama
n
o
Fix 'quick
f
ix' on pack-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C Hamano
pac
k
-obj
e
c
ts: quickfix for permission modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Update draft rele
a
se n
o
tes
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/Makefi
l
e:
fix sect
i
on (5) instal
l
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update
d
ocume
n
tat
i
o
n
l
inks
t
o point at v
1
.
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
/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C H
a
mano
Mer
g
e branc
h
'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
m
a
n
o
Merge bran
c
h 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
am
a
no
Merge
branch 'lt/gitli
n
k'
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
io C Haman
o
Merge br
a
nch 'n
p
/pa
c
k'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Mer
g
e branch 'jp/
r
efs'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
M
e
rge branch 'jc/qu
i
ckfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Mer
g
e branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C
Ham
a
no
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io
C Hamano
lockfile: rec
o
rd th
e
p
r
i
m
ary p
r
o
c
ess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
convert
.
c: restruct
u
r
e the attribute checki
n
g
part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
ano
Fix bogus linked
-
l
i
st manag
e
ment for us
e
r defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
git-clone: f
i
x dumb pro
t
o
col tran
s
port to clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
git-add -u: match
the inde
x
with
w
orking
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C
Hamano
M
er
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
Docu
m
e
n
t
gitatt
r
i
butes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
Update 'crlf'
a
ttribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
D
ocument
a
tion: support manual
s
ection (5) - file
f
orm
a
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
J
unio C
H
amano
Simplify code
to find recu
r
sive me
r
ge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hama
n
o
Counto-fix in merg
e
-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C
H
a
m
an
o
F
i
x funny types
used
i
n
attribute value repre
s
entation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Al
l
o
w
low-level driv
e
r to speci
f
y
differ
e
nt behavio
u
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C
H
amano
C
u
stom
low-level merge driver: change the
c
o
nfiguration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C
H
aman
o
Allow th
e
d
e
fau
l
t lo
w
-level merg
e
driver to be confi
g
ured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
C
ustom low-l
e
vel merge dr
i
ver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ha
m
ano
Merge
b
ranc
h
'fl/cvss
e
rver'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
a
n
o
U
pdate dr
a
ft release
n
otes
f
or 1
.
5
.
2 with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Me
r
ge bra
n
ch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
S
t
art
p
reparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Merge branch
'master' of git://r
e
po
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Me
r
ge
b
ran
c
h 'maint' of git://repo
.
or
.
c
z
/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Merge branch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
J
uni
o
C Hamano
Add a demonstration
/
test of cu
s
tomized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hama
n
o
A
l
low s
p
ecifying spe
c
ializ
e
d merge-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
git-gui: Honor TCLTK_PATH if
s
upplie
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-recursive: sep
a
r
a
te
out xdl_merge() interfa
c
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow more than true/false to attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make
su
r
e
q
u
ick
f
e
t
ch is not
f
oo
l
ed with a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io C Hama
n
o
Me
r
ge branch 'js/wrap-
l
o
g
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Hamano
send-em
a
il: do
n
ot 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
branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hama
n
o
Merge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Ch
a
nge attribute negation marker from '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Defi
n
e a bui
l
t-in a
t
tribute mac
r
o
"binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ham
a
no
attri
b
ute macr
o
supp
o
rt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
M
a
kef
i
le
:
add patch
-
ids
.
h
bac
k
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
a
mano
Fix 'diff'
a
ttribute semant
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'crlf' attribute
semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Merge git://git2
.
ker
n
el
.
org/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'diff' about 'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Define 'crlf' attr
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Add basic i
n
f
r
astru
c
ture to assign attribu
t
es to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Haman
o
Replace a p
a
i
r of patches with updated one
s
for subp
r
oject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Do not defa
u
lt to --no-index w
h
en gi
v
en two director
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
M
e
rge branch 'jc/cherry
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Hamano
F
i
x
git {log
,
show
,
.
.
.
} --prett
y
=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
Do
c
u
m
e
ntation: --ch
e
rry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io
C
Hamano
g
i
t-log -
-
cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
i
o C Hamano
Re
f
a
c
t
o
r
patch-id f
i
lte
r
i
n
g ou
t
of g
i
t-ch
e
rry and
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %
m
to
'
--pretty=f
o
rm
a
t:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Me
r
ge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o 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 complain on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
i
o C Hama
n
o
Merge br
a
nch
'maint
'
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
H
ama
n
o
git-fetc
h
: use
fetch--tool
p
ick-rr
e
f to
a
v
oid
l
ocal
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
git
-
fet
c
h--tool
pick-r
r
ef
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
t
3030: me
r
ge-recur
s
ive backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-re
c
ursive: handle D/F
c
onf
l
i
c
t case more c
a
refully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next