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
Support 'diff=pgm' attribute
2007-04-23
J
u
n
io C Hamano
Support 'diff=pgm' att
r
i
bute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
pack-
o
bjects: make
g
e
nerated
pac
k
file re
a
d
-
only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
unio
C Hamano
Update tests no
t
to assume
t
hat generated
packfi
l
es
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fix 'qu
i
c
k
f
ix'
on p
a
ck-
o
bjects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
pack-obj
e
cts:
q
u
ickfix for permission mode
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Ha
m
ano
Update
d
raft r
e
le
a
s
e
note
s
f
o
r
v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Documentati
o
n/Makefil
e
:
f
ix se
c
ti
o
n (5)
insta
l
lati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update d
o
cumentation l
i
nks to point
a
t v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Mer
g
e
b
r
a
nch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
Mer
g
e
b
ranch '
j
c/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Haman
o
M
e
r
g
e b
r
an
c
h 'jc/attr
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Merge
b
ranch 'lt/gitl
i
nk'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
b
ranch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
Merge branch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
i
o
C H
a
m
a
n
o
M
erge bra
n
ch 'jc/qui
c
kfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge
b
ranch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hama
n
o
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
lockfile: r
e
cord the primar
y
process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Hama
n
o
convert
.
c: restructure the attribute checking p
a
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Hamano
Fix bogus linked-list management for
user d
e
fined merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Haman
o
git-clone: fix dumb protoc
o
l transport to clone from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
uni
o
C Haman
o
git-add -u: match the
i
n
d
ex with working tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
D
o
cum
e
nt
gitattribu
t
es(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
Up
d
at
e
'c
r
lf'
attri
b
ute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
Docume
n
tat
i
o
n
: supp
o
rt manual section (5) - file forma
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
mano
M
erg
e
branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C Hamano
Simpli
f
y
c
ode to find
r
e
c
ursive merge dr
i
ver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-fix in merge-recu
r
s
i
ve
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hama
n
o
M
e
rge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix f
u
n
n
y types
used
i
n
attribute value representation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hama
n
o
Allow l
o
w-level driver to s
p
ecify diff
e
rent behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Cus
t
om low-level
merge dr
i
ver:
c
h
a
nge the configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C
Hamano
Allow the default low-leve
l
m
erg
e
driver to be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
Ha
m
ano
Custom low-level merg
e
driver suppo
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Mer
g
e branch
'
fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Haman
o
M
e
r
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Update
d
raft release notes for 1
.
5
.
2 with
a
ccumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C H
a
man
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Start prepar
i
ng for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'master' o
f
gi
t
://repo
.
o
r
.
c
z/git-g
u
i
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merg
e
br
a
nch 'main
t
' of
g
it://repo
.
or
.
cz/
g
it-gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
unio C
H
aman
o
Merg
e
bran
c
h 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Haman
o
Add a demon
s
tr
a
t
i
o
n
/
t
est of customize
d
me
r
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
amano
Allow specifying speciali
z
ed merge-backend per
p
at
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C H
a
mano
git
-
gui: Honor TCLTK_
P
A
TH if supplie
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
merge-recursive
:
sep
a
rate out xdl_
m
e
r
ge() int
e
rface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
llow
m
or
e
than tr
u
e/fals
e
to att
r
ib
u
tes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
Mak
e
sure quickfetch is no
t
fooled
w
i
t
h
a previous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio
C
Hamano
Me
r
g
e
branch
'
js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Ha
m
ano
send-e
m
ail: do not leav
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 Ham
a
no
M
er
g
e bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Change attr
i
bute negation ma
r
k
er fro
m
'!'
t
o '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
man
o
Define a
b
uilt-in attr
i
bute ma
c
ro
"
binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
a
n
o
a
ttri
b
ute
macr
o
support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio
C
H
amano
Make
f
il
e
: ad
d
pa
t
ch-ids
.
h ba
c
k
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C Hamano
F
ix 'diff' attribute seman
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Fix 'crlf' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
M
e
rge git
:
//git2
.
kernel
.
org/p
u
b/scm/
g
itk/g
i
tk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
unio C
H
amano
T
eac
h
'di
f
f'
a
bout 'diff' attri
b
ute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
D
e
fi
n
e 'crlf' attrib
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add
basic infra
s
tructure to assign attributes
t
o paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Re
p
lace a pa
i
r of patches with
updated ones
f
or subpro
j
ect
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
H
a
m
ano
D
o not defa
u
lt to --no-index
w
hen giv
e
n t
w
o directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
Merge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C H
a
mano
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix
git {log,s
h
ow,
.
.
.
}
--
p
retty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
D
ocumentation: --ch
e
r
r
y-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
a
n
o
git-log
-
-cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
Refactor pa
t
ch
-
id filtering out o
f
git
-
c
h
e
r
r
y
and
g
it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Haman
o
A
dd %m to '--pretty=
f
or
m
at:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
io C H
a
mano
Merge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io
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
mano
f
sck: do not complain on detac
h
ed HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Haman
o
Merg
e
bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
H
a
m
a
no
g
it-f
e
tch: use fetch--tool
p
ick-rref to
a
void
l
ocal
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hama
n
o
g
i
t-fetc
h
-
-
t
ool p
i
ck-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C H
a
man
o
t3030: merge-recursive b
a
c
ken
d
test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
merge
-
recursive: handle D/F c
o
nflict ca
s
e more caref
u
lly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
m
erge-recursive: do
not
b
a
rf on
"to be rem
o
ved" entri
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Ham
a
no
Treat D/F conf
l
ict entry more
carefully in unpack-t
r
ees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t1000: fix ca
s
e table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
shortlog -w
:
make wrap-line behavi
o
ur op
t
ional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
Merge branch
'
j
c/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Me
r
g
e
br
a
nch 'jc/
m
erge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Merge
branch 'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Documen
t
ation/cmd-list
.
made to
.
gi
t
ignor
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Ham
a
no
Start 1
.
5
.
2 cycle
by pr
e
pareing RelNotes
for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
M
erge
b
ran
c
h 'jc
/
read-
t
ree
-
df' (
e
arl
y
part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
M
e
rge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prepare
f
o
r
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C Ham
a
no
A
new mer
g
e st
r
agety 'su
b
tree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
g
i
t-push
t
o
multiple locations does not stop at
the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-pu
s
h r
e
ports
t
h
e
URL after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Ham
a
no
M
erge bran
c
h 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
H
a
mano
M
erge branch 'fp/make-
j
'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C Hamano
Merge branch 'cc/bisect'
commit
|
commitdiff
|
tree
next