repo.or.cz
/
git
/
gitweb.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 Ha
m
ano
gitattribute
s
docu
m
ent
a
tion: clarify over
r
iding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
J
u
ni
o
C Hamano
t/
t
est
-
lib
.
sh: Protect
o
ursel
v
es f
r
om common mis
c
o
n
figuration
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Haman
o
Mer
g
e bra
n
ch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Hamano
B
u
ild RPM with
E
T
C_GITCONFIG=/etc
/
gitconfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C H
a
m
a
n
o
t6030
:
g
r
a
b commit
o
b
j
ect name as we go
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Ham
a
no
t5302: avoid using tail -c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Hamano
Docu
m
e
n
t
"diff=driv
e
r" attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio
C
H
amano
Suppo
r
t
'dif
f
=
pgm'
attri
b
u
t
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C Hamano
pack-objects: ma
k
e gen
e
rated packfile
r
ead
-
only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Upda
t
e test
s
not
t
o
assume that generated pa
c
k
f
i
l
es
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fix
'q
u
ickfix' on pack-objects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
pack-objects: qu
i
ckfix fo
r
permissio
n
modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
H
amano
Update draft
r
e
l
e
ase no
t
es for v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Documentation/Makefile
:
fix
s
ection (5) ins
t
allation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
U
pdate documentatio
n
lin
k
s
to
po
i
nt at v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Merge branch 'lt/ob
j
a
lloc'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C
Hama
n
o
M
e
r
ge
b
ranch 'j
c
/ad
d
'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
M
e
rge branch 'jc/a
t
tr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge b
r
anch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
n
o
Merge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Me
r
ge
branch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branc
h
'
j
c/quic
k
f
etch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
ano
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
i
o
C Hamano
lockfile: recor
d
the prima
r
y process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
c
o
nvert
.
c:
restructure the attribute checking pa
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hama
n
o
Fix bogus linke
d
-list manag
e
ment for
u
ser defined
m
e
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
g
it-clone: fix dumb protocol tran
s
p
ort
t
o clone
fro
m
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o
C Hamano
git-add -u:
m
at
c
h t
h
e index with working tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Do
c
ument gitatt
r
ibutes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Ham
a
no
Update 'crlf
'
att
r
ibu
t
e semanti
c
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C Hama
n
o
Documen
t
ation: sup
p
o
r
t
m
anual s
e
ction (5) - file formats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io C Ham
a
n
o
S
i
m
plify co
d
e to find recursi
v
e merg
e
dri
v
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
H
ama
n
o
Counto-fix in
m
erge-rec
u
rsiv
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge bran
c
h 'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
mano
Fi
x
funn
y
t
y
pes u
s
e
d
in at
t
ribute
valu
e
represent
a
ti
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
m
a
no
Allow low-level
driver to specify
di
f
f
erent beh
a
v
i
our
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-l
e
vel
merge driver: change the configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C
H
aman
o
A
llow the default low-level merge driver to
be
c
onfigured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low
-
level me
r
ge
d
river support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
mano
Merge branch 'fl/cvs
s
erver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Me
r
ge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
Update draft re
l
ease notes for 1
.
5
.
2 w
i
th accu
m
ul
a
t
e
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge
branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ham
a
no
Start
p
re
p
aring
f
or 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Me
r
ge branc
h
'master'
of git:
/
/
rep
o
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
ano
Merge branch 'mai
n
t' of git://repo
.
o
r
.
cz/git-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Merge branch 'jc/rea
d
-tree
-
df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a demonstrat
i
on/test of
c
ustomized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Ha
m
ano
Allo
w
speci
f
ying
specialized merge-backend
per
p
ath
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hama
n
o
g
i
t
-g
u
i
:
H
o
n
or TCLTK_PATH
i
f sup
p
lied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Haman
o
merge-recursive: separate out xdl_merge(
)
interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
Hamano
Allow more
t
han
true/false to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C
H
aman
o
Mak
e
sure quickfetch i
s
not
f
ooled with a
p
revious
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C Hamano
Merge branc
h
'
js/wr
a
p-log'
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Haman
o
send-email
:
do
n
ot leave
a
n empty CC: line if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Hamano
Merge br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Mer
g
e branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Chang
e
attrib
u
te negation mark
e
r from '
!
' to
'-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
io
C
Hamano
Define a buil
t
-in
attr
i
b
ute macro
"
b
inary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribute macro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
un
i
o
C Hama
n
o
Makefile: add p
a
t
c
h-ids
.
h
bac
k
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Fix 'diff' a
t
tri
b
u
t
e semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
F
i
x
'crlf' attribute
se
m
an
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
M
e
rg
e
git://git2
.
ker
n
el
.
o
r
g/pub/sc
m
/gi
t
k/gi
t
k
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
T
e
ach 'diff' about 'diff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Ha
m
an
o
D
e
fine 'crlf' attrib
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Ham
a
no
Add basic infrastructure to
a
ssign attributes to p
a
t
hs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Merge b
r
a
n
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-14
J
unio
C
Hamano
Rep
l
ace a pair of patches w
i
th
u
pdated ones fo
r
subprojec
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do n
o
t default to --no
-
index when given two di
r
ectories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
Me
r
ge branch 'jc/che
r
ry
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ham
a
no
Me
r
ge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hamano
Fix git {
l
og,s
h
ow,
.
.
.
}
-
-pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Ha
m
ano
Do
c
umentation: --che
r
ry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
io C Haman
o
git-log
-
-cherry-p
i
ck A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
Refact
o
r p
a
t
c
h-id filtering
o
ut of git
-
cherr
y
and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
n
o
Add %m t
o
'--pr
e
tt
y
=f
o
rma
t
:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
Merge bran
c
h '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 H
a
ma
n
o
fsck: do
n
ot
complain on detached
HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Ha
m
a
no
Merge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
g
it-fetch: use f
e
tch--too
l
pick
-
rref to avoid
loc
a
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
git-f
e
tc
h
--
t
oo
l
pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t3030:
merge
-
recursive
b
acke
n
d te
s
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-recursive: handle D/
F
co
n
flict case more
c
arefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
H
am
a
no
merge-recu
r
s
ive: do not barf
on "t
o
be removed" e
n
tries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Treat D/F con
f
lict entry more
c
aref
u
lly in
u
npack-
t
rees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
a
n
o
t100
0
:
f
i
x case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io
C
Hamano
shortlog -w
:
m
a
ke wra
p
-line behav
i
our
optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge
b
ra
n
ch 'jc/p
u
sh'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
erge branch
'
j
c
/
merge-subtree
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Mer
g
e branch 'js/fet
c
h-prog
r
ess'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
man
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Ham
a
no
A
d
d Documentatio
n
/cmd-list
.
m
ad
e
to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
ano
S
tart 1
.
5
.
2 cycle by prepareing R
e
lNotes for
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C H
a
mano
M
e
rge br
a
n
c
h 'jc/read
-
tre
e
-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
next