repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Update draft release notes for v1.5.2
2007-04-22
Juni
o
C Haman
o
U
pdate dr
a
ft rele
a
se n
o
tes
f
o
r
v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
D
o
cumentation
/
Makefile: f
i
x
s
e
ction (5) installati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
a
n
o
Upda
t
e documentati
o
n lin
k
s
t
o po
i
nt at v
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branc
h
'l
t
/o
b
jalloc
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge br
a
nch
'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Ham
a
n
o
Merg
e
b
r
anch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o
C
Hamano
Merge branch 'lt/
g
itlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge bran
c
h 'np
/
p
ack'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Mer
g
e
branch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Merge branch '
j
c/quic
k
f
etch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
un
i
o C Hamano
lock
f
ile: re
c
ord th
e
prima
r
y process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
convert
.
c: res
t
ructure
t
he attribute c
h
ecking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
Fi
x
bogus lin
k
ed-li
s
t
management for user defined
merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
Hama
n
o
git-clone: fix dumb prot
o
col transport to clone
from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
git-add -u: match the in
d
ex with
w
orking tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Ham
a
n
o
Docu
m
e
nt
gitattri
b
ut
e
s
(
5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C H
a
mano
Update 'crlf' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Haman
o
Do
c
umentation: support manual section (5) - file for
m
ats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
H
amano
Merge br
a
nch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify code
t
o
f
ind recursive merge driv
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-fix in me
r
ge-recursi
v
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Merge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix funny types used in at
t
r
i
bu
t
e value rep
r
esentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
A
l
l
ow low-level driver to specify diffe
r
ent b
e
hav
i
our
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
a
n
o
Cus
t
om
l
ow-level me
r
g
e
driver: change the
c
onf
i
guration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
A
l
low the d
e
f
a
u
l
t
low
-
le
v
el
m
erge driver
t
o be configu
r
ed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C Hamano
Custom low-level merg
e
d
r
iver
suppor
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'fl/
c
vsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Update
d
raft rele
a
se n
o
tes f
o
r
1
.
5
.
2 with a
c
cumula
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o C Ham
a
no
S
t
ar
t
preparing
f
or 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C Hamano
Me
r
g
e
br
a
n
c
h
'
mas
t
er' of git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Merge branc
h
'maint' of git://rep
o
.
o
r
.
c
z/git-gui i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Ha
m
ano
Merg
e
bra
n
ch 'jc/read-
t
ree-df
'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
dd a demonstration/test of
c
ustomized
me
r
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Haman
o
Al
l
ow specifyi
n
g specialized merge-b
a
ckend per pat
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
git-gui: Honor T
C
LTK_PATH if su
p
plied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merg
e
-
r
ecursive:
s
ep
a
rate
o
ut xdl_m
e
rge() interfa
c
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
a
n
o
Allow more
t
h
a
n true/false to attribute
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C
Ham
a
no
Make sure quickfetch
is not fooled with a
p
re
v
ious
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
un
i
o
C Hama
n
o
M
erge
bran
c
h 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
send-email: do not leave a
n
emp
t
y CC: line if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Ham
a
no
Merge bra
n
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Ch
a
nge attribute negation ma
r
ker from
'
!' to '-
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
D
efine a built
-
in
attribut
e
macro "bina
r
y"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hama
n
o
attri
b
ute macro suppo
r
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Makefile: add patch-ids
.
h
back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C
Haman
o
Fi
x
'diff' at
t
ribu
t
e
se
m
antics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Fix 'cr
l
f
'
attribute s
e
mantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Ham
a
no
Merge git://git2
.
kernel
.
org
/
pub/sc
m
/
g
itk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Teach
'diff' about 'diff' at
t
ri
b
ut
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
unio
C
Hamano
De
f
ine 'crlf' attr
i
b
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Add basic infrastruct
u
re to ass
i
gn attributes
to p
a
t
hs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Merge branch '
m
aint
'
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
io C Hama
n
o
Re
p
lace a
p
air o
f
pa
t
c
h
es w
i
th upda
t
ed ones for subpr
o
j
e
ct
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Do
n
o
t
default to --no-index when given two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C H
a
mano
Merge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C
H
amano
Fix git {
l
og,s
h
ow,
.
.
.
} -
-
prett
y
=em
a
il
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
a
m
ano
Documentation: --c
h
erry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log --cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
un
i
o C Ham
a
no
Refactor pat
c
h-id
filtering out
o
f git-cherry
a
nd git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to
'--pretty=fo
r
mat:
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C H
a
mano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
GIT 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 compl
a
in on detached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merge
b
ranch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
io C Ha
m
ano
git-fetch: use f
e
t
c
h--tool
p
i
c
k
-rref to avoid local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Ha
m
a
n
o
git-
f
etc
h
--tool pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t3030
:
merge
-
rec
u
rsive backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
am
a
no
merge-recursiv
e
: handle
D
/F
conflict
c
ase more care
f
ully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
me
r
ge-re
c
ursiv
e
:
do no
t
barf on "to be removed"
entr
i
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Treat D/F
conflict entry more 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
short
l
og -w: make wrap-
l
ine
b
ehaviour o
p
tional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o
C Hama
n
o
Merge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Ha
m
ano
Merge branch
'
jc/m
e
rge-subtre
e
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Haman
o
Merge b
r
a
n
ch
'
j
s/fetch
-
prog
r
es
s
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
Add Doc
u
m
entation/cmd-list
.
made
to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Star
t
1
.
5
.
2 cycle by prepa
r
eing RelNotes
for
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C Hamano
M
e
rge branch 'jc/read-tree-df' (early
p
art)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C H
a
mano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-08
J
unio C
Ham
a
n
o
P
repare 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 H
a
m
a
no
A
new merge stragety '
s
u
b
t
r
ee'
.
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 multiple
locat
i
ons does not s
t
op
a
t the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
g
it
-
pu
s
h reports th
e
URL after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge
bra
n
ch 'j
c
/ind
e
x
-
o
u
tpu
t
'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C Haman
o
Mer
g
e b
r
anch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merg
e
branch 'c
c
/b
i
sec
t
'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
Merge b
r
anch
'jc
/
checkout'
(
e
a
r
ly pa
r
t)
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C
H
a
m
ano
Documentatio
n
: tighten dependency for git
.
{ht
m
l,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C H
a
mano
git-bisect: allow bisec
t
ing with onl
y
on
e
bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ha
m
ano
t60
3
0
: a
d
d
a
bi
t
more tests to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next