repo.or.cz
/
git
/
fastimport.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Document "diff=driver" attribute
2007-04-23
Junio C Hamano
Documen
t
"diff=
d
riv
e
r" attrib
u
te
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Hamano
Su
p
port '
d
if
f
=pgm'
a
t
t
r
ibute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
pack
-
obj
e
cts:
make generated packfile
r
ead-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
U
pd
a
te
t
ests n
o
t
t
o a
s
s
ume that generated packfi
l
e
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fix 'quickfix' o
n
pack-object
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
pa
c
k-ob
j
e
ct
s
: q
u
ick
f
ix for permiss
i
on modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Update draft rele
a
se notes for v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io
C Hamano
Documentation/Mak
e
fi
l
e:
fix section (5) insta
l
latio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
un
i
o C Hamano
Update
d
o
c
umentation links to poin
t
a
t
v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Ha
m
a
no
Merge bra
n
c
h
'lt/objalloc
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
M
e
rge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
Ha
m
a
n
o
Merge bra
n
ch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Merge
b
r
a
n
ch
'lt
/
gitlin
k
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
b
r
anch 'n
p
/pa
c
k'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
mano
M
erge branch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
Hamano
Merge b
r
anch
'jc/qu
i
ckfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
ano
GI
T
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
lockfile:
recor
d
t
h
e
primary
p
rocess
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
c
onver
t
.
c: restruc
t
u
r
e
the attribute checking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C
Ha
m
ano
Fix bo
g
us
linked-list managemen
t
f
o
r us
e
r
d
e
fi
n
ed merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C
H
amano
git-clo
n
e: fix dumb protocol tr
a
nspor
t
to clone from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
git
-
a
dd -u: match
the index with
w
orking tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C H
a
mano
Merge
branch
'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Document git
a
tt
r
ibut
e
s(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Ha
m
ano
Up
d
at
e
'c
r
lf' attribute s
e
mantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
Documen
t
atio
n
:
s
up
p
ort manual se
c
t
i
on (5) - file form
a
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
man
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io C Hamano
Simplify
code to find
r
ecursive merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
C
o
u
nto-fix in merge-rec
u
rsive
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
Junio C Hamano
Fix funny types used in a
t
t
ribute va
l
ue re
p
rese
n
tation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow low-leve
l
driver to specify different b
e
h
aviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
n
o
Custom
low-l
e
vel merge dri
v
er: chang
e
the configurat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow the default low-l
e
v
el
merge drive
r
to be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
ni
o
C Ha
m
ano
Custom l
o
w-leve
l
m
e
r
g
e
d
river sup
p
o
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Merge branch
'fl/c
v
sserver'
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o
C
Haman
o
M
erge b
r
a
nch
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Haman
o
Update draft release
n
otes for 1
.
5
.
2 with accumul
a
ted
.
.
.
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
S
t
a
r
t prepari
n
g for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Merge
branch 'master
'
of git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Ham
a
no
Merge
branch '
m
aint' of
git://repo
.
or
.
c
z/
g
i
t
-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
unio C
H
ama
n
o
Mer
g
e bra
n
ch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a demonstration/t
e
s
t
o
f
custo
m
ize
d
m
e
rge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C H
a
ma
n
o
Allow sp
e
ci
f
ying
speci
a
lized
m
e
rge-backend
p
er path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
git-gui: Honor TCLTK_P
A
T
H
if s
u
pplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
man
o
merge-
r
ecursi
v
e: separat
e
out xdl_merge
(
)
interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
A
llow more than tr
u
e/false to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
Ma
k
e su
r
e qui
c
kfet
c
h is n
o
t f
o
o
led
wi
t
h a pre
v
ious
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Hamano
Merge branc
h
'js/
w
rap
-
log
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ha
m
ano
se
n
d-email: do not leav
e
an empty
C
C
: line if
n
o cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch '
m
a
i
nt
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ha
m
a
n
o
Me
r
ge branch
'
m
ain
t
'
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C
H
ama
n
o
Change attribu
t
e negation marker
fr
o
m
'!
'
to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
D
e
f
i
ne a bu
i
lt-in att
r
ibute macro "binar
y
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
io C
H
amano
attribute macr
o
support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C
Hamano
Makefile: a
d
d
p
a
t
c
h
-
i
d
s
.
h
bac
k
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'diff' at
t
ribute sem
a
ntics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C
H
amano
Fix 'crlf' a
t
tri
b
ute s
e
mantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
M
erge
g
it:
/
/git
2
.
kernel
.
org/pub/scm/gitk
/
git
k
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hama
n
o
Teach 'd
i
ff
'
a
b
out 'diff' at
t
r
i
b
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
De
f
ine 'crlf'
a
ttrib
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add ba
s
ic inf
r
astructure t
o
a
s
sign attributes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Replace a
pa
i
r of patches wi
t
h updated ones for
subpro
j
ect
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
Hama
n
o
Do not def
a
u
l
t to -
-
n
o
-index whe
n
giv
e
n two director
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
Hamano
M
e
rge br
a
nc
h
'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
H
amano
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
H
am
a
no
Fix git {log,show,
.
.
.
} --pret
t
y=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documentation:
-
-cher
r
y-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
gi
t
-log --cher
r
y-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Ham
a
no
R
e
factor
p
a
t
ch-id filtering out of git-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io
C
Hamano
Add %m
to
'--pret
t
y
=
f
orma
t
:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Ha
m
ano
G
IT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fsck:
d
o not
compla
i
n on
d
etached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
a
m
ano
Mer
g
e
b
r
anch
'
maint
'
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
git-fetch:
u
se fetch--tool pick-rref to av
o
id loca
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-fetc
h
-
-tool pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C
Hamano
t3030: m
e
rge-recursive
backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
un
i
o C Ham
a
no
merge-recu
r
sive: handle
D
/
F
c
o
nflict case more car
e
fully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-recursive: do no
t
barf on
"to be removed" entrie
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
Ham
a
no
Treat D/F confli
c
t
entry more carefully i
n
u
n
p
ack-tre
e
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ham
a
no
t
1
000: fi
x
c
ase table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
s
h
ortlog -
w
: make wrap
-
li
n
e behaviour opt
i
on
a
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C
Hamano
Merge br
a
nch 'j
c
/pus
h
'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hama
n
o
Merge branch 'jc/merge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge br
a
nch
'
js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hama
n
o
Add Docume
n
tation/cm
d
-list
.
m
ade to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
Start 1
.
5
.
2
c
ycle by prepareing
R
el
N
otes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C
H
aman
o
M
e
rge b
r
anch '
j
c/read-tr
e
e-df' (ear
l
y
p
a
r
t
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o 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
J
u
n
io C Ha
m
ano
A new merge stragety 'su
b
t
r
ee'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
mano
git-push to multiple loc
a
t
i
ons does not stop a
t
t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
git
-
push
re
p
orts the
UR
L
af
t
er fail
i
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Ha
m
ano
M
e
rge
b
ra
n
c
h
'jc/index-o
u
t
p
ut
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
Merge b
r
a
nch 'fp/make-j'
commit
|
commitdiff
|
tree
next