repo.or.cz
/
git
/
vmiklos.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 'diff=pgm' a
t
tribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
pack-obje
c
ts: mak
e
g
e
nera
t
e
d p
a
ckfile read-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Jun
i
o C Ha
m
ano
U
p
date tests not to assume that generat
e
d pac
k
files
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C H
a
mano
Fi
x
'quickfix' on p
a
c
k
-
obje
c
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C
Hamano
p
a
ck-objects: quick
f
ix for
permissi
o
n mo
d
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
H
amano
Up
d
ate draft release
n
ote
s
for v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o
C
Hama
n
o
Docume
n
t
at
i
o
n/
M
akefile: fix section (5) install
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
U
p
d
a
te documentation links 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
Mer
g
e
branch 'l
t
/
o
b
j
al
l
oc'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
Merge
b
r
anch 'jc/
a
d
d
'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C
H
am
a
no
Mer
g
e b
r
anch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
i
o C Ha
m
ano
Merge branch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Merge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge branc
h
'
j
p/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Merge branch 'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Merge br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2007-04-21
J
unio C
H
amano
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
Hamano
lockf
i
le: record the primary process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Hamano
convert
.
c: restructure the a
t
tribute checking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
H
amano
F
i
x
bo
g
us linked-
l
ist man
a
gement for
user defined me
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Hamano
git-
c
lone: fix
d
umb protoco
l
transport to cl
o
ne from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
ni
o
C Hamano
g
i
t-add
-u: match the
i
ndex with worki
n
g tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ham
a
no
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-20
J
u
n
io
C Hamano
Docu
m
ent
g
itattribu
t
es
(
5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
Update 'crlf' attribu
t
e semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
Documenta
t
io
n
: support manual sectio
n
(5) -
fil
e
forma
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Hamano
Merge b
r
anch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
S
implify code to find recursive
mer
g
e driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ha
m
a
no
Counto-fix in merge-re
c
ursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix funny
typ
e
s used in
a
t
tribu
t
e value
r
e
pre
s
enta
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
A
l
low low-le
v
el driver to specif
y
different beh
a
v
iour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C
Hamano
C
u
stom low-l
e
ve
l
merge driver
:
c
h
ange the configurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C H
a
m
a
no
Al
l
ow the default low-leve
l
m
erg
e
driver to be con
f
igured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ham
a
no
Custom lo
w
-level merg
e
driver suppor
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Ha
m
an
o
M
e
r
ge bra
n
ch
'
fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hama
n
o
Merge br
a
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Update draft
r
e
le
a
s
e
n
otes for
1
.
5
.
2
with
accumulate
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
H
amano
M
e
rge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
ma
n
o
Sta
r
t
prepa
r
ing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C Hamano
Me
r
ge
br
a
nch
'master'
o
f
g
it://re
p
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o
C Hamano
M
e
rg
e
branc
h
'maint' of
g
i
t:
/
/rep
o
.
or
.
c
z
/
git-gu
i
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
mano
M
er
g
e
b
ranch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C
Haman
o
A
d
d
a
d
emonstrat
i
on/test of customized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Ha
m
ano
Allow specifying specialized merge-backend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
git-
g
ui: Honor TCLTK_PATH if suppli
e
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
merge-recursive: separate ou
t
xd
l
_merge() int
e
rface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o C Hamano
All
o
w more
than true/false to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C
H
amano
Make su
r
e qu
i
ckfetch
is not fooled wit
h
a
previous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hama
n
o
M
e
rge b
r
a
n
ch 'js/
w
rap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Ha
m
a
n
o
send-email:
d
o
n
ot leave an
e
mpty C
C
: line
if
n
o cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
unio
C
Hamano
Merge br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C Ha
m
ano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Change
attribute negation marker from '!'
t
o
'-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Defin
e
a built-in attribute mac
r
o "
b
inary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribute m
a
cro sup
p
ort
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C
H
amano
Makefile: a
d
d patch-ids
.
h
back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix '
d
i
f
f'
attribute s
e
mantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hama
n
o
Fix 'crlf' attribu
t
e seman
t
i
c
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C Ha
m
a
n
o
Merge git
:
//gi
t
2
.
kernel
.
org/pub/s
c
m
/
gitk
/
gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Teach
'dif
f
' a
b
ou
t
'diff'
a
ttr
i
bute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
uni
o
C Ham
a
no
Define
'
crlf'
att
r
ibute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
A
dd basic
i
nfrastructure to
assign attributes to pat
h
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Replace a
p
air of patches with updated ones f
o
r subp
r
oject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C
H
aman
o
Do not defa
u
l
t
to
-
-
no-in
d
ex
wh
e
n given two direc
t
ories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branch '
j
c/c
h
erry'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o
C
Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C Ha
m
an
o
Fix git {log,show,
.
.
.
}
-
-pretty=
e
mail
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documentation: --cher
r
y-pi
c
k
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
git-log --cherry-pick
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io
C
Hamano
Refactor
pa
t
ch
-
id fil
t
ering out
o
f gi
t
-
c
herry
and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add
%m to '--pretty=
f
or
m
at:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
Merge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-12
J
unio
C Ham
a
no
G
IT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
J
u
nio
C
Hamano
fsck:
d
o not complain on d
e
tache
d
HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hama
n
o
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
git
-
f
e
tch: u
s
e
fet
c
h--
t
o
o
l
pi
c
k-rref
t
o avo
i
d
l
ocal
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C
Hamano
g
it-fetch--tool pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
i
o
C H
a
mano
t3
0
30: merge
-
recursive
bac
k
end t
e
st
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
mer
g
e-recursive: handl
e
D/F conflict case more caref
u
lly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
merge-rec
u
r
sive:
do not
b
arf
on "to be removed" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Ham
a
no
Tr
e
at D
/
F confl
i
ct entry m
o
r
e carefully in
unpack-tr
e
es
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
t1000: fix case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
shortlog -w: make
w
rap-line
b
ehaviour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C H
a
mano
Merge
b
r
anch 'jc/pus
h
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Ham
a
n
o
M
e
rge branch 'jc/m
e
rge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
ama
n
o
Merge branch
'js/fe
t
ch-p
r
ogress'
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Add Doc
u
me
n
tation/cmd-list
.
made t
o
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C
H
amano
Start 1
.
5
.
2 cycle by
p
r
epareing Re
l
No
t
es for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'j
c
/
r
ead-tre
e
-
d
f
'
(ear
l
y
part)
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
P
r
epare for 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 'subtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
Hamano
g
i
t-push to
m
ultiple locations
does not stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
gi
t
-pus
h
report
s
the URL after f
a
i
ling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Haman
o
Merge bran
c
h
'
j
c/
i
ndex-
o
utput'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merge branch '
f
p/m
a
ke-
j
'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
Merge branch 'c
c
/bisec
t
'
commit
|
commitdiff
|
tree
next