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
Junio C
H
amano
git
a
tt
r
i
b
utes d
o
cu
m
entation
:
clari
f
y overridi
n
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Hamano
t/test-l
i
b
.
sh: Pr
o
t
e
ct oursel
v
es from comm
o
n misconfiguration
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Hamano
Bui
l
d RPM
w
i
th ETC_GITC
O
NFIG=/
e
tc/gitconf
i
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Hamano
t6030: grab com
m
it object
n
a
m
e as we
g
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
no
t5302:
a
void using tail -c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C
H
a
m
an
o
Documen
t
"diff=dr
i
ver" attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
ni
o
C Ham
a
n
o
Support 'diff
=
p
g
m
'
attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
n
io C H
a
m
ano
pack-objects:
m
ake generated packfile read-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Update tests
n
o
t
to
a
ssu
m
e that generated packfile
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fi
x
'q
u
ickfix' on p
a
ck-objects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C H
a
ma
n
o
pack-o
b
j
ects: quickfix
for pe
r
mission modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
Update draft release notes
f
or v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
am
a
n
o
Documentation/Mak
e
fil
e
:
fix section (
5
) installation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
H
amano
Update do
c
umentation links to point at v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Merge br
a
nc
h
'l
t
/objallo
c
'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Mer
g
e branch 'jc/a
d
d'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Merge
bran
c
h '
j
c/at
t
r
'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C
H
amano
Merge
bran
c
h 'lt
/
gitli
n
k'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Merge
b
ran
c
h 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Ha
m
a
no
M
erge branch
'
jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
an
o
Merge branch
'j
c
/quic
k
f
e
tch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
M
er
g
e branc
h
'maint
'
commit
|
commitdiff
|
tree
2007-04-21
Jun
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 Ha
m
an
o
lockfile: record
the primary process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Hama
n
o
convert
.
c: restructure the attribu
t
e
c
hecking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
a
man
o
Fix bo
g
us
l
inked
-
list mana
g
ement fo
r
user de
f
i
ned
m
erge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Ha
m
ano
git-c
l
one: fix dumb protocol
t
ransport to clone from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C Hamano
gi
t
-add
-
u
:
match the index wi
t
h working
tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
Merge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Document gitattributes(5
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
i
o
C
Hamano
Upda
t
e 'crlf'
a
ttri
b
ute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Docume
n
tatio
n
:
support manual section (5)
-
file fo
r
mats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ham
a
no
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-19
Junio
C H
a
mano
Simpli
f
y co
d
e
to find
recursi
v
e
mer
g
e dri
v
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Haman
o
Counto-
f
ix in me
r
ge-
r
e
c
ursiv
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Fix funny
types used
i
n attribute
v
alue re
p
resentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
Hama
n
o
A
l
low low-level driver to specify different behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
C
u
stom
low-level merg
e
d
r
i
v
er: change the c
o
nf
i
guration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Allow
t
he de
f
ault l
o
w-level merge driver
to be configur
e
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Custom low-level merge
driver sup
p
ort
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C Hamano
Merge br
a
nc
h
'fl/cvsserver
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hama
n
o
Update dra
f
t release notes
f
or
1
.
5
.
2 wi
t
h accumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C Hamano
Start pre
p
aring
f
or
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C Hamano
Merge b
r
a
n
ch 'master'
of git://repo
.
o
r
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Merge bra
n
ch '
m
a
i
nt' of git://repo
.
or
.
cz/
g
it-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Mer
g
e
branch 'jc/re
a
d
-tree
-
df'
commit
|
commitdiff
|
tree
2007-04-17
J
unio C H
a
m
an
o
Add a
demo
n
stration
/
test of customized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C
Hamano
Allow s
p
ecifyin
g
s
p
ecial
i
zed m
e
rge-backend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
git-gu
i
: Honor
TCLTK_PATH if supp
l
ied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merg
e
-
r
ecursive
:
s
eparate out xdl_merge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o
C
Hamano
Allow more t
h
a
n
tru
e
/false to
a
t
t
ributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
M
ake s
u
r
e
quickfetch is
n
ot foo
l
ed with a
previous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ham
a
no
Merge branch 'j
s
/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
send-email: do not
leave an
e
m
pty CC: line if
n
o
c
c
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
aman
o
Me
r
ge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-16
J
unio C H
a
mano
M
e
rge branc
h
'
maint
'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
Cha
n
ge att
r
ibute negation m
a
rker
from
'!' to '-
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
uni
o
C
Hamano
Defi
n
e
a
bu
i
lt-in a
t
tribute macro "b
i
n
a
ry"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
at
t
r
i
bute macro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
i
o
C
Hamano
Makefile: add patch
-
ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Fi
x
'diff' attri
b
ute
s
eman
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Haman
o
Fix 'crlf' attr
i
bute sema
n
t
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Merg
e
git:/
/
git2
.
ke
r
nel
.
org/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Te
a
ch 'd
i
f
f
' about 'diff' attrib
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Ham
a
no
D
efine 'cr
l
f' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
A
dd basic infr
a
s
tructure to
assign attr
i
butes to
p
aths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
M
erge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
R
e
place a
p
a
i
r of patches w
i
t
h
u
pda
t
ed ones f
o
r
sub
p
roje
c
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hamano
Do not default
t
o --no
-
index when giv
e
n two
d
ir
e
c
tories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Mer
g
e
b
ranch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
ama
n
o
Fix g
i
t {log,show,
.
.
.
} --
p
retty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documen
t
ation:
-
-cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
git-l
o
g
--cherry-
p
ick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
Refacto
r
patch-id filtering out of git-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Ha
m
ano
Add %m to '--
p
retty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Ham
a
no
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
GI
T
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
f
s
ck
:
do not
compl
a
i
n
on detached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-fetc
h
:
u
se fetch--tool p
i
c
k
-rref to avo
i
d local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
g
i
t-f
e
t
c
h--to
o
l
pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
un
i
o
C
Hamano
t3030: merge-recursive backend tes
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C H
a
ma
n
o
me
r
ge-r
e
curs
i
ve: handl
e
D/
F
confli
c
t case more carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
me
r
g
e-rec
u
rsiv
e
: do not barf
on "
t
o be rem
o
ve
d
"
ent
r
ies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
Tr
e
a
t D/F c
o
n
flict entry more carefully in
u
np
a
ck-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
t1000: fix case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
shortlog -w
:
make wrap-line
b
ehaviour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
rge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
Merge branch 'jc/
m
erge
-
subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Merge branch 'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add
Do
c
umentation
/
c
md-list
.
made to
.
g
i
tignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
a
mano
Start 1
.
5
.
2
cycle by prepareing RelNot
e
s for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Merge
br
a
n
c
h 'jc/read-tree-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
io C
H
aman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
next