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
nio C
Haman
o
Support
'
d
iff=pgm
'
attrib
u
te
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
pa
c
k-objects: make gen
e
rated packfile
re
a
d
-onl
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
U
pdat
e
tests n
o
t
t
o
assum
e
that generated packfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Ha
m
ano
Fix 'quickfix'
on pack-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
pack
-
obj
e
ct
s
: q
u
ickfix for permissio
n
modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
U
pdat
e
draft re
l
ease 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
e
ct
i
on (5) i
n
s
tallation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update d
o
cume
n
tation li
n
k
s to point at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Me
r
ge
bran
c
h 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
io
C Ham
a
n
o
Merge branch
'
jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Merge branch
'
jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Merge b
r
anch
'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
io C Hamano
M
e
rge
branch 'np/p
a
ck'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch
'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge branch 'jc
/
quickfe
t
ch'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
G
I
T 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ham
a
no
lock
f
ile: record the primary pro
c
ess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
convert
.
c:
r
estruc
t
ure the attribute checking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
Fix bo
g
us linked-list mana
g
ement for u
s
er define
d
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
git-clo
n
e: fix
d
u
m
b protocol transport to clone
from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
g
it
-
add
-u
:
match the in
d
e
x
w
ith work
i
ng tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C H
a
m
ano
Docu
m
ent git
a
ttributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
Up
d
ate 'crlf' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Ham
a
no
Documentatio
n
:
s
upport manual section
(5
)
-
file form
a
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
unio C
Hamano
Merge
b
ranch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify c
o
de to find
r
ecursive merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Cou
n
to-fix i
n
merge-r
e
c
u
rsive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Haman
o
Fix funny t
y
pes used in attrib
u
te value r
e
presentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
A
l
low low-level
d
r
iver to
s
pecify diffe
r
ent behav
i
our
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Cus
t
o
m
low-le
v
el merge driver:
change the confi
g
u
r
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C
H
amano
Al
l
ow th
e
defau
l
t low-level merge driver to be confi
g
u
r
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
Custo
m
low-l
e
vel merge driver supp
o
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Haman
o
Merge
branch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
M
e
r
g
e
b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C Hama
n
o
U
p
date draft release notes for
1
.
5
.
2
w
i
th ac
c
u
mulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Ha
m
an
o
Merge
b
ranch
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
Hama
n
o
Start p
r
e
paring for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o
C Hama
n
o
Merge bra
n
ch 'master' of
git://repo
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merg
e
branch 'm
a
int' of git://repo
.
or
.
cz/
g
i
t
-gui int
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ha
m
ano
Merge branch 'jc/read-tree-d
f
'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a
demonstration/te
s
t of customi
z
ed merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio
C
H
amano
All
o
w spec
i
f
ying
spec
i
a
liz
e
d
merge-backend per pa
t
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
g
it
-
g
ui: Honor TCLTK_PATH i
f
supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C
H
a
m
ano
merge-recu
r
sive
:
sep
a
rat
e
out xdl_merge() inte
r
fa
c
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ha
m
ano
A
l
l
ow more th
a
n true/false to attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make sure qu
i
ckfetch i
s
no
t
fooled with a p
r
e
vi
o
us
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
i
o
C Hamano
Merge br
a
n
c
h
'j
s
/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C H
a
mano
s
e
nd-email: do
n
o
t le
a
ve a
n
e
m
pty
C
C
: line i
f
no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C H
a
ma
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C
Haman
o
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hamano
Change attribute negation
marker fro
m
'!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Define a bui
l
t-in attribute macro "b
i
nary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C
H
ama
n
o
attribute
macr
o
support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile: add patch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
F
i
x '
d
iff' attr
i
bute
sem
a
n
t
ic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C
Hamano
Fix 'crlf'
attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Mer
g
e
g
it://git2
.
k
ernel
.
org/pub/
s
cm/git
k
/git
k
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Haman
o
Tea
c
h 'diff' abo
u
t 'd
i
ff
'
att
r
ibute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Defi
n
e
'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io
C
Hamano
Add basic infrastructure to assign attribute
s
to path
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C
H
amano
Replac
e
a pa
i
r
of patches w
i
t
h
upd
a
ted ones for subprojec
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
H
a
m
ano
Do no
t
default to --no-index wh
e
n
given
t
wo directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Ha
m
ano
Merge br
a
nch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge
branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio
C
Hama
n
o
Fix
gi
t
{log
,
show
,
.
.
.
} --pret
t
y=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
an
o
Documentation: --ch
e
r
ry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
gi
t
-
l
og
--cherry-pi
c
k A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
un
i
o C Ha
m
ano
Refactor patc
h
-id fil
t
ering
out
of
git-cherry
and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
A
dd %m
t
o '--pretty=format:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Ham
a
no
G
I
T
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
J
u
nio
C
H
amano
fsck:
d
o not compla
i
n
on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C Hamano
Merge
b
ran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
git-fetch: use fetch
-
-to
o
l pi
c
k
-
rref to avoid local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-fetch
-
-t
o
ol
pick-
r
ref
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
Juni
o
C H
a
man
o
m
e
rge
-
recursive: handl
e
D
/
F conflict case mo
r
e
c
arefu
l
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
a
n
o
merge
-
recu
r
sive: do n
o
t
barf on "to be remov
e
d"
entri
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Treat D/F conflic
t
entry
m
ore car
e
fully in unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
t1
0
00: fix case ta
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio
C
Ham
a
n
o
shortl
o
g -w: m
a
ke wr
a
p-l
i
ne behaviour optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Mer
g
e
b
ranch 'jc/pu
s
h
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
erge
b
ranch 'jc/m
e
r
ge-subt
r
e
e
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C H
a
m
a
no
M
er
g
e b
r
a
n
ch 'js/fetch-pro
g
re
s
s'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C
Hamano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
i
o
C Hamano
Add Document
a
tion/cm
d
-l
i
st
.
made t
o
.
git
i
gno
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
Star
t
1
.
5
.
2 cycle by prepareing RelNotes for
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'jc/read
-
tree-df' (early p
a
rt)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Hamano
Prepa
r
e for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
mano
A
new merge stragety 'subtr
e
e'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push
to multip
l
e locat
i
ons does not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
H
amano
g
i
t-push r
e
ports the
URL after faili
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge
b
ranch 'jc/index-outpu
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
br
a
nch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
Merge branch 'cc/bisect'
commit
|
commitdiff
|
tree
next