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
Update documentation links to point at v1.5.1.2
2007-04-22
Junio C Hama
n
o
Update
d
ocum
e
ntation
li
n
ks to
p
oint at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merg
e
branch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hama
n
o
M
er
g
e branch
'
jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge branch 'j
c
/attr'
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
io C Hama
n
o
Me
r
g
e
br
a
nch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Merge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Merge bran
c
h
'
jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io
C
Hamano
M
er
g
e branch 'jc/qu
i
c
kfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
m
ano
GIT
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io
C
Hamano
lo
c
kfile: record the p
r
imary pr
o
cess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
c
onvert
.
c: res
t
ructure the attr
i
b
u
te
che
c
ki
n
g part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
H
a
m
ano
Fix bogu
s
link
e
d
-
list man
a
gement for user define
d
m
e
rg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Hama
n
o
git-clone:
fix
d
umb
p
r
o
tocol transport to clon
e
from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
git-add -u: match the inde
x
with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
Document gita
t
tributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Up
d
ate 'crlf' at
t
ribut
e
semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
D
o
cum
e
ntation: support manual
s
e
c
ti
o
n (5) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
unio C
H
amano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Haman
o
Simplify code to
fi
n
d
re
c
ursive merge
dr
i
ver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
Hamano
Cou
n
to-fix in
m
erge-r
e
cursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C
Hama
n
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
ano
Fix funny types used
in at
t
ribute value
r
epresentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Allow low-level driver to speci
f
y different b
e
hav
i
our
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Ham
a
no
Cu
s
tom low-lev
e
l m
e
rge driver: change the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
H
amano
Allow
t
he def
a
u
lt
lo
w
-level merge driver to be config
u
red
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C Hamano
Custom low-
l
evel me
r
ge driver supp
o
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge
b
ranch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o C Hamano
M
erg
e
branch
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Upd
a
te
d
raft release note
s
f
o
r 1
.
5
.
2
with a
c
cumulate
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
M
e
rge bran
c
h 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Start preparing
f
or 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
ni
o
C Hamano
Merge branc
h
'm
a
ster'
of gi
t
://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
M
erge branch 'main
t
' of git:/
/
repo
.
o
r
.
cz
/
git-
g
u
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
unio
C Hama
n
o
Merge branch '
j
c/r
e
ad-t
r
e
e
-
d
f'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a demons
t
r
ation/t
e
st of cust
o
m
ized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Haman
o
Allow s
p
ecifying
s
pecialize
d
merge-backend
per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
gi
t
-
g
ui: Honor TCLTK_PATH if
s
upplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-recu
r
sive: separate out xdl_merge() int
e
rface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
Allow more than true/false to attribute
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
Make sur
e
quickfetch is not fooled with
a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge bra
n
ch
'
j
s/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C
Hamano
send-ema
i
l: d
o
not leave an empty CC: line if
n
o cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C H
a
mano
Cha
n
ge
a
ttribute negat
i
on m
a
rker from '!' t
o
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Define a
built-in attr
i
bute macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
a
n
o
att
r
ibute ma
c
ro sup
p
ort
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C Hamano
Makefile: add p
a
tch-ids
.
h
back
i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Fi
x
'diff' at
t
r
i
b
u
te sema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Fix 'crlf' attribute sema
n
t
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
an
o
Merge git://git2
.
kernel
.
org/p
u
b/scm
/
gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
i
o C Ham
a
n
o
Teach
'
diff' abou
t
'diff' a
t
tribu
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
am
a
no
Def
i
n
e
'crlf'
a
ttri
b
ute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio
C Hamano
A
dd
ba
s
ic
i
nfrast
r
ucture to assign attributes
to pa
t
hs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C H
a
m
ano
Merge b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Replace a pair
of patch
e
s with updated one
s
for subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Do no
t
default to --
n
o-
i
ndex
w
hen
g
iv
e
n two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
M
e
rge branch 'jc/ch
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C H
a
mano
Merge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C
H
amano
Fix git {log,sho
w
,
.
.
.
}
--pr
e
tty=emai
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Ha
m
ano
D
o
cumentation: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
git-
l
og
--cherry-pi
c
k A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
Refa
c
t
or patch-id filterin
g
out o
f
git-cherr
y
and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to
'
--pre
t
ty=form
a
t:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C
Ha
m
ano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio
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: do not complain on det
a
ched HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
git-fetc
h
:
u
se fetch--tool pick-rref to avoid
local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C
H
a
m
an
o
g
it-fetc
h
--tool pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
t3
0
30:
me
r
ge-recursiv
e
b
ackend
t
est
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merg
e
-recursive: handle D/F conflict case more carefu
l
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
merg
e
-r
e
cursive:
do n
o
t barf on
"
t
o b
e
remo
v
e
d" entrie
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
Treat
D
/F conflict ent
r
y more caref
u
lly in un
p
ack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t1
0
00: fix c
a
se table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
sh
o
rtl
o
g -w: make wra
p
-l
i
ne b
e
haviour optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
am
a
no
M
erg
e
branch
'
j
c/push
'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
Merge branch '
j
c/merge
-
subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Merge branch 'js/fet
c
h-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Me
r
g
e
branch
'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hama
n
o
Add Documentati
o
n/cmd-list
.
made
to
.
gitign
o
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C
Hamano
Start 1
.
5
.
2 cyc
l
e by prepareing RelNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Merge
b
ranch 'jc
/
read-tree-df' (e
a
rly part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
Merge
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-08
J
un
i
o C Hamano
Prepare
for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Ham
a
no
A new merge stra
g
et
y
'
s
ubt
r
ee'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C
Hamano
g
i
t
-
p
u
sh to multipl
e
locati
o
ns does not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
git-
p
us
h
reports the URL
a
fter
f
a
i
ling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Ha
m
a
no
Merge branch 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
Merge b
r
anch 'fp
/
mak
e
-
j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merge branc
h
'
c
c/bisect
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'jc/check
o
ut
'
(ea
r
ly par
t
)
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Me
r
ge bran
c
h '
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C Hamano
Docum
e
ntation: tight
e
n depe
n
d
en
c
y
for git
.
{
h
tml
,
txt
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C
H
amano
g
i
t-b
i
sect:
al
l
o
w b
i
sect
i
ng with on
l
y one ba
d
commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030
:
add a bit
more tests to git-
b
i
s
e
c
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Ha
m
ano
g
it-bisect: modernizat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
next