repo.or.cz
/
git
/
dscho.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
Juni
o
C
H
am
a
no
Su
p
po
r
t 'di
f
f=pgm' attr
i
bute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ham
a
n
o
p
ack-obj
e
cts: make generated packf
i
le
r
ead-
o
n
l
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Up
d
ate tests not to assume
t
hat genera
t
e
d p
a
ckfiles
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Fix 'quickfix' on p
a
ck-object
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
un
i
o C Ham
a
no
pack-obj
e
cts: 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 release notes for
v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Haman
o
Documentation/Mak
e
fi
l
e:
f
ix
s
ectio
n
(5) inst
a
llation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
aman
o
Update documentation links to
p
oint a
t
v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
ma
n
o
Merge branch 'l
t
/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hama
n
o
Merge branch 'jc/
a
dd'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Merge
b
ran
c
h 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C
Hama
n
o
Merge br
a
n
c
h 'lt/gitlink
'
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
io C Haman
o
Merge br
a
n
ch 'np/pa
c
k'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Me
r
ge branch 'jp/r
e
f
s
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
Merge branch 'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
i
o C Ha
m
ano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio
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
l
ockfile: record the primary process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
Hamano
con
v
e
r
t
.
c
:
restructure the attribute checking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
mano
F
i
x bogus lin
k
ed-list management for user define
d
me
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
amano
gi
t
-clone
:
fix d
u
m
b protocol transport t
o
cl
o
ne
f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
git-add -u: match the
i
n
d
e
x with wo
r
k
ing tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C Hamano
Me
r
ge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
Document
g
itattributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
U
p
date 'crlf' attrib
u
t
e
semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
Documentation: support manual se
c
tion
(
5
)
- file for
m
ats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
J
u
n
io C H
a
mano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
mano
Simplify co
d
e t
o
find recursive
merge d
r
iver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Haman
o
C
o
unto-fix
in merge
-
recu
r
sive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C Hamano
Fix funny ty
p
es
u
s
ed
i
n attri
b
ute value rep
r
esentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Allow low-level driver
t
o specify
d
if
f
erent beh
a
viour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
ano
Cust
o
m
l
ow-level m
e
rge driv
e
r
:
ch
a
nge the configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
A
llow the default
l
ow-
l
evel merge driver to be con
f
i
g
ured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level me
r
g
e
d
river sup
p
ort
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
e
rge branc
h
'fl/cvsserve
r
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Ham
a
n
o
Updat
e
dr
a
f
t
re
l
e
a
se notes for 1
.
5
.
2 with accumulat
e
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merge bra
n
ch
'
maint
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
S
tart
pr
e
paring
for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
M
erge branch
'
m
a
s
t
er' o
f
g
i
t://
r
epo
.
o
r
.
cz/g
i
t-gu
i
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C Haman
o
Merge br
a
nc
h
'm
a
int' of git://repo
.
or
.
cz/g
i
t-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Merge
b
r
anch 'jc/read
-
tre
e
-
df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
Add a demonstrati
o
n/t
e
s
t
of cu
s
to
m
ized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
llow specifying s
p
ecialized merge-b
a
ck
e
nd p
e
r p
a
th
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Ham
a
n
o
git-gui: Ho
n
or TCLTK_PATH if
s
upplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-re
c
ur
s
ive: separate o
u
t
xdl_merge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o
C Hamano
Al
l
o
w
more than true/false to attrib
u
t
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
Make sure quic
k
f
e
tch is n
o
t
f
ooled with a prev
i
ous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C
H
a
m
ano
Merge branc
h
'js/wrap-log
'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Ha
m
ano
sen
d
-email
:
do not
leave an empty CC: line
if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C H
a
m
a
no
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
C
h
ange at
t
ri
b
ute
negation marker fro
m
'!
'
to
'
-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
Define a
buil
t
-
i
n
att
r
ibute
m
acro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Haman
o
attribute
macro suppo
r
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C
Hamano
Makef
i
le: add
p
a
t
ch-i
d
s
.
h
b
ack in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'diff' attri
b
ute sem
a
n
tics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
uni
o
C Hama
n
o
F
i
x 'crlf' attribut
e
sem
a
ntics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Merg
e
git://
g
it2
.
kernel
.
org/pub/scm/gitk/git
k
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C
H
amano
Teach 'dif
f
' about 'diff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hama
n
o
Def
i
ne 'crlf' at
t
ribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Haman
o
Add b
a
sic i
n
frast
r
ucture to
a
s
sign attribut
e
s to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Merge
branch
'
maint
'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
R
e
p
lace a pair of
p
atches wit
h
up
d
ated ones for subp
r
ojec
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Do not
d
efault
t
o --no-in
d
ex when given tw
o
direct
o
ries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C Hamano
M
e
rge branch '
j
c/che
r
ry'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio
C Hamano
Me
r
g
e
b
ran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
Fix 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
umenta
t
ion: --cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
g
it-log --cherry-pick
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
Re
f
actor patch-id
f
ilterin
g
out of g
i
t-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ha
m
ano
Add %m
t
o '--pr
e
tty=fo
r
m
a
t:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
Merge branc
h
'ma
i
nt'
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 Ham
a
no
fsck: do not complain o
n
detached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
gi
t
-fe
t
ch: use
f
et
c
h
--t
o
ol pick-rref to avoid local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-
f
etch--tool
pick
-
rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio
C
Hamano
t3030:
merge-recursive back
e
nd test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
merge-recursive: handle D/F c
o
nflict case mor
e
caref
u
lly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
uni
o
C Ha
m
ano
merg
e
-recursive: do
n
o
t
barf on "to be
r
emoved" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
Tre
a
t
D/F conflict entry more
c
a
r
ef
u
lly in unpac
k
-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
i
o C H
a
mano
t1000:
fix case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
s
h
ortlog -w
:
make wrap-
l
ine
b
ehaviour
optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Merge branch
'
jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Merge
b
r
a
nch 'jc/merge-subt
r
ee'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
r
g
e branch '
j
s/fetch
-
progress'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio
C
Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
A
d
d Documentation/cmd-list
.
made to
.
g
itignor
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Haman
o
Start 1
.
5
.
2 c
y
cle by pre
p
areing RelNot
e
s for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge
branch 'jc/
r
ead-tree-
d
f
' (early p
a
r
t
)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
Prepare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
A new
m
erge str
a
gety '
s
ubtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
g
i
t-push
t
o mul
t
i
pl
e
locations does not
s
top a
t
the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-pu
s
h reports the
U
RL a
f
ter failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o C
Hamano
Me
r
ge bran
c
h 'jc/index-outpu
t
'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Merge branc
h
'
f
p
/make
-
j'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
H
a
m
ano
Merge branc
h
'cc/b
i
sect'
commit
|
commitdiff
|
tree
next