repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
gitweb: Show "no difference" message for empty diff
2007-04-23
Junio
C Hamano
Support
'
d
i
f
f=pg
m
'
a
ttribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
aman
o
p
a
ck-obje
c
ts
:
ma
k
e generated pac
k
file read-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio
C Hamano
U
pdate
t
e
sts not
to assume that generat
e
d packfi
l
es
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fix 'quickfix'
on p
a
ck-objects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Ham
a
n
o
pack-object
s
: quick
f
ix for p
e
rmission
modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Up
d
ate draft releas
e
notes for v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Do
c
um
e
nta
t
io
n
/Makefile: fix
section (5) instal
l
a
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Update docum
e
n
t
ation links to point at
v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C
H
amano
Merge
branch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Merge bra
n
ch '
j
c/
a
dd'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio
C
Hamano
Merge branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge b
r
anch 'lt/gi
t
l
ink'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C
Hamano
Mer
g
e branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C Haman
o
M
e
rge branch
'
j
p/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge b
r
anch
'
jc/qui
c
kfe
t
ch'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
M
e
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
GI
T
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
un
i
o
C
Ha
m
an
o
lockfile: recor
d
th
e
p
r
imary process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
amano
conve
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 Hamano
Fix bogus
linke
d
-list management for user
d
e
f
ined m
e
r
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hama
n
o
git-clone: fix dumb pr
o
tocol transport
to clone from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Hamano
git-add -u: match the index
with
w
o
rking t
r
ee
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-20
J
unio
C
Hamano
Document g
i
tat
t
ributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio
C
Hamano
Updat
e
'cr
l
f
' a
t
tribute semantic
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
Docu
m
ent
a
t
i
o
n
:
s
u
pport m
a
nual
section (5) - file formats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C Hamano
Si
m
plify
c
ode to
f
ind recurs
i
ve
me
r
ge drive
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Haman
o
Counto-fix in merge-recurs
i
ve
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C H
a
mano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Fix f
u
nny ty
p
es used i
n
attribute
v
alue
representa
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ham
a
no
Allow
low
-
level dr
i
ve
r
to spe
c
ify differ
e
n
t
behavi
o
ur
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level merge dri
v
er: chan
g
e
t
he configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Allow t
h
e defau
l
t low-level mer
g
e driver t
o
be con
f
i
gured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Custom low-level
m
erg
e
drive
r
suppo
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Ham
a
no
Merge branch
'
fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Update dra
f
t release notes
for 1
.
5
.
2 with accumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Sta
r
t pr
e
parin
g
for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
unio C H
a
m
a
n
o
Merge branch 'master' of
g
it:
/
/repo
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge
branc
h
'maint'
of g
i
t:/
/
re
p
o
.
or
.
cz/g
i
t-g
u
i into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
M
e
rge b
r
anch 'jc/
r
ead-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add
a
demonstration/test
of customize
d
m
e
rge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
All
o
w specifying s
p
ecialized merg
e
-
backend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
git-gui: Honor TCLTK_PA
T
H i
f
supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
m
erge-recursiv
e
: separate out xd
l
_merge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hama
n
o
Allow more th
a
n true
/
false
to attribu
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Make sure qui
c
kfetch is not foo
l
ed with a previous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Hamano
Merge
b
ranch 'js
/
wrap
-
lo
g
'
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io C Hamano
send-email: do not leave
an em
p
t
y
CC: l
i
n
e if no
c
c
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ham
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ha
m
a
no
Merge
branch
'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Change attribute neg
a
tio
n
marker from '!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Def
i
ne
a
built-in att
r
i
b
u
t
e
mac
r
o "
b
i
n
a
ry"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
attr
i
bu
t
e macro supp
o
rt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
Makefile: add pa
t
ch-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C
H
amano
Fix 'diff' attribute
semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Fix 'crl
f
' at
t
ribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
M
e
rge git://git2
.
ke
r
n
e
l
.
org/
p
ub/
s
cm/
g
itk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'd
i
ff' about 'diff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Def
i
ne 'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
H
amano
Add basic infrastruc
t
ure to assign attrib
u
tes t
o
p
a
t
h
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
Replace
a
pair o
f
patches
w
ith u
p
d
ate
d
o
n
es
f
or subproje
c
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Do not defaul
t
to --no-ind
e
x
when
given t
w
o directorie
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ham
a
no
Me
r
g
e
branch 'j
c
/cherr
y
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io
C
Hamano
Fix git {log,show,
.
.
.
} --pretty=em
a
il
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
Documenta
t
ion: --
c
herry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
git
-
log --
c
herry-p
i
ck A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
R
efactor patch-id filtering out of
git-
c
herry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
uni
o
C Hamano
A
dd %m to '--p
r
et
t
y=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C
Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
G
I
T
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C
Haman
o
fsck
:
do not complain on detac
h
ed HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
g
i
t-fetch: use fetc
h
--tool pick-rref to avoid l
o
cal
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
gi
t
-
f
etch--tool pick-
r
r
e
f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
t3030: merge-recursive backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
m
erg
e
-recursive: handle D/F con
f
l
ict cas
e
more carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-re
c
ursive:
d
o not
b
arf on "to be removed" entr
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
Treat D/
F
c
o
nflict entry
more c
a
refu
l
ly
in
unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ham
a
no
t1000
:
fix
c
a
s
e tabl
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C
H
ama
n
o
shortlo
g
-w:
make wrap-line behav
i
our o
p
tional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
M
erge
b
ranch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merg
e
branch 'jc/merge
-
subtree
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Ha
m
an
o
Mer
g
e branch 'js/fetch-pr
o
gress'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Haman
o
Merge branc
h
'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add D
o
c
u
men
t
a
t
ion/
c
md
-
list
.
ma
d
e to
.
g
i
ti
g
n
o
re
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hamano
Start 1
.
5
.
2 cycle by p
r
epareing RelNotes for
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
man
o
Merge branch 'jc/r
e
a
d
-tree-df'
(
early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Me
r
g
e
b
ran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
P
r
epar
e
for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
A
n
ew merge stragety 'subtr
e
e'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Ham
a
no
git-p
u
sh to mult
i
ple locations doe
s
not s
t
op at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C Hamano
git-pus
h
reports
t
h
e
URL after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
M
erge branch 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
H
ama
n
o
M
erge
b
ranc
h
'fp/
m
ake
-
j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
m
a
no
Merge
branc
h
'cc/bise
c
t'
commit
|
commitdiff
|
tree
next