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
t/test-lib.sh: Protect ourselves from common misconfiguration
2007-04-24
J
unio
C
Hamano
t/test-lib
.
sh: Protect
ours
e
lves from common
misconf
i
guration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hamano
Mer
g
e branch
'
ma
i
n
t'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Bui
l
d RPM w
i
th ETC_GIT
C
ONFIG=/etc/gitconf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t6030: grab c
o
mm
i
t object name a
s
w
e go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C H
a
mano
t530
2
:
a
v
o
i
d
u
sing tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hama
n
o
Docu
m
ent "diff=driver
"
a
t
tribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
unio
C
H
amano
S
u
pport 'diff=pgm' attribu
t
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C Hamano
p
ack-objects
:
ma
k
e generated packfile read-on
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C Hamano
Update tests not to assume th
a
t generat
e
d packfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Fix 'quickfix' on p
a
ck-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Ham
a
no
pac
k
-ob
j
e
c
ts: qu
i
ckfix for permissio
n
modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
i
o
C
H
ama
n
o
Update dra
f
t release
notes for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Docu
m
entatio
n
/M
a
kefile: fix se
c
tio
n
(5)
i
nstallation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
i
o
C
Hamano
Update docum
e
ntation
l
i
n
ks
to 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 Hamano
Merge b
r
anch 'l
t
/objallo
c
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Me
r
ge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Ham
a
n
o
Merge bran
c
h 'jc
/
attr'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o
C
H
aman
o
Merge branch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Merge b
r
anc
h
'np/p
a
ck
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
n
o
Merge branch
'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C H
a
m
a
no
M
erge branc
h
'jc/qui
c
kfetch'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C
H
a
mano
Merge bran
c
h 'main
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 Hamano
lockf
i
le
:
record the primary pro
c
e
s
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
Haman
o
convert
.
c: restruct
u
re t
h
e attribu
t
e che
c
king
part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Hamano
F
ix bogus linked-list managem
e
nt for user
d
efined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio
C Hamano
git-c
l
one: fix du
m
b p
r
otocol transport to clon
e
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
gi
t
-add -u: m
a
tch the index with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Merge br
a
nc
h
'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Docu
m
e
n
t
gita
t
tributes(
5
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
n
i
o C
Hamano
Update 'crlf' attribute seman
t
ics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Docu
m
entation: suppor
t
m
anual sectio
n
(5) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
H
amano
Mer
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-19
J
u
n
io C Hamano
Simplify c
o
de to find r
e
cu
r
sive 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
m
erge-recursiv
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C
Haman
o
Me
r
g
e
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hama
n
o
Fix fun
n
y types
us
e
d in att
r
ib
u
te valu
e
representation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
a
n
o
A
llow
low-level d
r
iver to specify di
f
ferent
b
e
haviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low
-
level merg
e
driver: change
the configurat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Ham
a
no
Allow t
h
e
default low-level
merge driver to
be con
f
i
gured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Custom lo
w
-level m
e
rge d
r
iver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
e
rge branch 'fl/cvss
e
rver'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C Hamano
Update dra
f
t release
n
o
tes for
1
.
5
.
2
with
a
ccumulat
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
S
t
art pr
e
paring for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merg
e
br
a
nch 'master'
of git://r
e
po
.
o
r
.
cz/gi
t
-
g
ui
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C Haman
o
Merge branc
h
'main
t
' of git://re
p
o
.
or
.
c
z
/gi
t
-gui
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
Merg
e
b
r
anch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
Add a demonstration/test of cu
s
tomized merg
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow sp
e
cifyin
g
specialized merge-back
e
nd pe
r
path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
g
i
t
-gui: Honor TCLTK_PAT
H
i
f
supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-
r
ecursive: separa
t
e out xdl_merge() i
n
terface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow m
o
re than
t
r
u
e/false to attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o C Hamano
Make sure q
u
i
ckfet
c
h is not fooled with a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Ha
m
ano
M
erge branch 'js/wra
p
-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Hamano
sen
d
-
e
m
ail:
do
no
t
lea
v
e an empty CC: line
if no
c
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
Merge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io C Hamano
Merge
b
ran
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Chan
g
e attrib
u
te
negation marker
f
ro
m
'!' to '
-
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Define
a
bui
l
t-
i
n
attribu
t
e
macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C Haman
o
attribute macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
Hama
n
o
Makefile: add
p
a
tch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hamano
Fix '
d
i
ff' attribute sem
a
ntics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix '
c
rlf' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hama
n
o
Mer
g
e gi
t
://git
2
.
k
e
r
nel
.
org/p
u
b/scm/gitk/
g
itk
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Teach 'diff' ab
o
ut 'diff' at
t
ribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Defi
n
e 'crl
f
' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
A
dd basic infrastructure to assign attribut
e
s t
o
paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Replace a
p
a
i
r of p
a
tch
e
s
with u
p
date
d
one
s
for subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
D
o
n
ot
d
e
f
a
u
lt
t
o
--no-index when given
two directo
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C H
a
m
an
o
Merge
b
ran
c
h 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C H
a
m
a
n
o
Merge b
r
a
nch
'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C Hamano
F
ix git {log,sh
o
w,
.
.
.
} --pret
t
y=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Ha
m
ano
Documen
t
ati
o
n: --cherr
y
-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-pic
k
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor patch-id filtering out of git-c
h
erry and g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Ha
m
ano
A
dd
%m to '--pretty=format:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
M
e
rge
branch 'ma
i
nt'
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
J
unio C Hamano
fsck: do
n
o
t
complain on det
a
ched HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
M
erge
b
ranch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
git-fetch: use fetch--tool pick-rre
f
to avoid loc
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
g
i
t-fetch--too
l
pick-rre
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ham
a
no
t3030: mer
g
e
-recursi
v
e
b
ackend
t
e
st
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
un
i
o
C
Hamano
merge
-
recursive: hand
l
e D/F confli
c
t c
a
s
e
more carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
merge-rec
u
rsive:
d
o not barf on "to be
r
emoved" entr
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Trea
t
D/F con
f
li
c
t
entry more c
a
refully in unpack
-
trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
t1000: fix case tabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
s
h
or
t
log -w: m
a
ke wrap-line
be
h
aviour opt
i
onal
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
Merg
e
b
ranch 'jc/pus
h
'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Merge b
r
anch 'jc/me
r
ge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Me
r
ge branc
h
'
j
s
/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Haman
o
Add
Docu
m
e
n
tation/c
m
d-list
.
made to
.
gitign
o
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
Sta
r
t 1
.
5
.
2 cycle by
p
reparein
g
RelNotes fo
r
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C
Hamano
Me
r
ge b
r
an
c
h
'jc/read-
t
r
ee-df' (earl
y
part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
Merge
b
ranch
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
Prepare for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next