repo.or.cz
/
git
/
jnareb-git
/
bp-gitweb.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
S
upport 'diff=
p
gm'
a
tt
r
ib
u
te
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
pac
k
-obje
c
ts: make generated pac
k
file re
a
d-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C
Hamano
Upda
t
e tests
n
ot to
a
ssu
m
e that
g
enerated pac
k
files
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Fix 'quickfix' on pack
-
objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
pack-objects: quickfix
f
o
r
permis
s
ion modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o
C Hamano
Update
d
raft release
notes
fo
r
v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Documentation/Make
f
ile
:
fix section (5)
installation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hama
n
o
Upd
a
te docum
e
ntation li
n
k
s
t
o
p
oint
at
v
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Ha
m
ano
Merge branc
h
'lt
/
objal
l
oc'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Merge bran
c
h
'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Mer
g
e branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Ha
m
ano
Merge branch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Merge branch
'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge branch
'
jp/
r
efs'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Ha
m
ano
Me
r
ge branch 'j
c
/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
mano
l
ockfile: record
the
pri
m
a
ry process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
unio
C Hamano
c
o
n
vert
.
c: re
s
tructu
r
e
t
he attri
b
u
te checking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ham
a
no
Fix bogus linked-li
s
t management for
u
ser
d
efi
n
ed merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Hamano
git
-
clone: fix dum
b
protoco
l
tra
n
sport to clon
e
from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Haman
o
git-a
d
d -u: matc
h
the index
w
ith work
i
ng tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ham
a
no
Mer
g
e b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
Doc
u
ment gitattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
n
io C Hamano
U
pdate
'
crlf' attribute semanti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o
C Hamano
D
ocu
m
entation: support manu
a
l
s
ection (5) -
file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Juni
o
C Ham
a
no
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
Hamano
Simpl
i
fy code to fi
n
d recursive merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-fix in merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Me
r
ge branch
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Haman
o
Fix fu
n
ny type
s
u
s
ed in attrib
u
te value
r
epres
e
n
t
a
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Ham
a
no
Allow
low-lev
e
l dr
i
ver to specify different
be
h
avi
o
u
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
H
am
a
n
o
Cu
s
tom low-leve
l
merge d
r
iver: change th
e
conf
i
gurat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Allow the
default low-level me
r
g
e driver
to
be config
u
red
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Cu
s
tom
l
ow-l
e
vel merge driver supp
o
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
uni
o
C Hamano
Merge br
a
nch 'fl/cv
s
s
e
rver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
m
ano
Update draft release notes fo
r
1
.
5
.
2 wi
t
h accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
S
t
a
rt pr
e
paring for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
amano
Merge b
r
anch '
m
aster' of g
i
t://repo
.
or
.
c
z
/g
i
t-gui
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C Hamano
Merge branch 'maint'
of git://repo
.
or
.
cz/git-gui i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
Merg
e
b
ranch
'
jc/r
e
ad-tree-
d
f
'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add
a
d
emons
t
ration
/
t
e
st of customize
d
mer
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
i
o
C Hamano
Allow s
p
ecify
i
ng specia
l
i
z
ed merge-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
g
i
t-gui:
Hono
r
TCLTK_PATH if suppli
e
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
m
ano
mer
g
e-recursive:
separa
t
e out xdl
_
m
e
rge() inte
r
face
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
ma
n
o
A
l
low more than tr
u
e
/f
a
lse
t
o attrib
u
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make sure quickfetch
i
s n
o
t fooled with
a
p
r
evious
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
u
n
i
o C Hamano
M
e
rge branch 'js/
w
rap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Hamano
s
e
nd
-
email: do not leave
an empty CC: line if no
c
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
unio C H
a
mano
M
erge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
C
hange attri
b
u
te nega
t
ion
marker
f
rom
'
!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hamano
Define a
b
uilt
-
in attr
i
bute macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
att
r
ibute macro
support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o
C Hama
n
o
Makefi
l
e
:
add pat
c
h-ids
.
h b
a
ck in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C H
a
mano
Fix 'diff' attr
i
bute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
Fix 'cr
l
f' at
t
ribute semanti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C H
a
m
a
n
o
Merge git
:
/
/git2
.
k
ernel
.
org/
p
u
b
/
s
cm/g
i
t
k
/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
n
o
Teach 'diff' about 'diff' a
t
trib
u
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C
Hamano
Define '
c
rlf' att
r
ib
u
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C Hamano
Add basi
c
inf
r
a
structure to ass
i
gn a
t
tr
i
butes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
uni
o
C Ha
m
ano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C
H
amano
Replace
a pair
of p
a
tche
s
w
ith u
p
da
t
ed ones
f
or subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Haman
o
Do not default to -
-
n
o-in
d
ex
when gi
v
e
n
t
wo dir
e
ctories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
M
e
r
g
e branc
h
'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C
Haman
o
Fix git {
l
og,show,
.
.
.
}
--pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C
H
amano
D
o
c
u
m
entation:
-
-cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-
l
og --c
h
err
y
-p
i
ck A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
io C Hamano
Refactor patc
h
-
id filterin
g
ou
t
of git-che
r
ry and g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio
C
Hamano
Add %m to '--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C Ha
m
ano
G
I
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 comp
l
ain on detached HE
A
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
io C Hamano
g
i
t
-f
e
tc
h
: use fetc
h
--tool
p
ick-r
r
ef to av
o
i
d
local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
git-fetch--tool pic
k
-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
t3030: me
r
ge-recu
r
sive ba
c
ken
d
test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
m
erge-
r
ecursive:
h
andle D/F conflict
case
mo
r
e
c
arefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
merge-recu
r
s
i
v
e
: d
o
not barf on "to be removed" en
t
ries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
Treat D
/
F confl
i
c
t
e
ntr
y
more
c
a
refu
l
l
y
i
n unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
t1000:
f
i
x cas
e
table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Haman
o
sh
o
rtlo
g
-
w
: ma
k
e wrap-line behav
i
our optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
io
C
Hamano
Merge
b
ranch 'jc/pus
h
'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C
H
a
mano
Mer
g
e branch 'jc/merge-subtr
e
e'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merg
e
branch 'js/fetch-pro
g
ress'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
i
o
C Hamano
Merg
e
branch
'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Add Documentati
o
n/cmd-li
s
t
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
Sta
r
t 1
.
5
.
2
cycle b
y
prepareing RelNotes f
o
r it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
Merge branc
h
'jc/read-tree-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
i
o
C Ham
a
no
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Haman
o
Prepar
e
fo
r
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new merge
stragety
's
u
b
t
ree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Haman
o
git-push to multiple locations
d
o
es n
o
t stop at
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push rep
o
rts the URL after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Ha
m
an
o
Merge branch 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
Merge
branch
'f
p
/make-j
'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Haman
o
Me
r
ge b
r
anch 'cc/bisect'
commit
|
commitdiff
|
tree
next