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
lockfile: record the primary process.
2007-04-21
J
unio
C
Hamano
loc
k
fi
l
e
: record the prima
r
y p
r
ocess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
convert
.
c: restructure the attribut
e
checking
p
a
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Hamano
Fix
bogus linked-list man
a
gement
f
or user defi
n
ed merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Docum
e
nt gitatt
r
ib
u
tes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
Upda
t
e
'crl
f
' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Documentati
o
n: support manual s
e
ction (5)
-
file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
S
i
m
p
lify code to find
r
ecursiv
e
merge
d
river
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Co
u
nto-
f
ix in merg
e
-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Ha
m
ano
Fix
f
unny types used in at
t
ribute value repres
e
n
tation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C Hamano
Allow
l
o
w-level driver to speci
f
y different
behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level merge driver: change the co
n
figuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Al
l
o
w the
de
f
ault
l
ow-l
e
vel merge driver to be
c
onfigured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Ha
m
a
no
C
ustom
low-level merge dr
i
ver suppo
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
A
d
d a demonstratio
n
/te
s
t of c
u
stomized mer
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C
H
amano
Allow
s
pecifyin
g
specialized merge-
b
ac
k
end per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
merge-recu
r
sive: separate out xdl_m
e
rge() inte
r
fa
c
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow m
o
re than tru
e
/
f
alse
to
a
ttribute
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C Hamano
Ch
a
nge attribute negat
i
on
marker from
'
!' to
'
-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
Define a
built-in attr
i
bute ma
c
ro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
amano
a
ttribute
m
acro
s
u
pport
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Ha
m
ano
Makefile: add patch
-
i
d
s
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C Hamano
Fix 'diff' attrib
u
te
s
e
ma
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
a
m
a
no
Fix 'cr
l
f' at
t
ribute s
e
man
t
ics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Teach 'd
i
f
f
'
abou
t
'diff' attr
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Ha
m
a
n
o
Defin
e
'c
r
lf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add
b
asic infrastructure to a
s
si
g
n attr
i
b
u
t
e
s t
o
pa
t
hs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio
C Hamano
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
J
u
ni
o
C
H
a
m
ano
Do not
defaul
t
to
--no-index w
h
en
g
iven two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
M
erge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ham
a
no
Me
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o
C Haman
o
Fi
x
git
{log
,
show,
.
.
.
} --p
r
etty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
Doc
u
men
t
a
t
ion:
-
-cher
r
y
-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
uni
o
C Hamano
git-log --che
r
r
y
-
pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
io C Hamano
Refactor patc
h
-id filtering out of gi
t
-cherry and gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
aman
o
Add %m to '--pretty=for
m
at:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
Hamano
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
f
s
ck: do
n
ot complain on
detached HE
A
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
M
e
rge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
m
a
no
Merge
branch 'jc/merge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C
Hama
n
o
Merge
bran
c
h
'
j
s/fetch
-
progress
'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Documentation/cmd-list
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Hamano
Start 1
.
5
.
2 cycle
b
y prepar
e
ing RelNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
Mer
g
e branch '
j
c
/
read-tr
e
e-df' (early p
a
rt
)
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hamano
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Ha
m
ano
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 Haman
o
A n
e
w
m
erg
e
st
r
a
g
e
ty 'su
b
t
ree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push to
m
ultiple lo
c
ations doe
s
not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push repo
r
ts the URL
a
fter failin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
M
e
r
ge
b
ranch 'jc/ind
e
x-output'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
Hamano
Merge branc
h
'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge br
a
nch 'c
c
/
bisect'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Merge branch 'jc/
c
hecko
u
t' (
e
arly part)
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C
H
a
mano
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Docu
m
e
ntation:
tig
h
ten dep
e
n
denc
y
f
o
r
git
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Ham
a
no
git-b
i
se
c
t: allow b
i
secting with
o
nly
o
ne bad comm
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
uni
o
C Hamano
t6030
:
add a
bit m
o
re t
e
s
ts
t
o git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
J
u
nio C Hamano
git-b
i
sect: mod
e
rnizati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C Ha
m
ano
M
erge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hama
n
o
Ren
a
me add
_
file_t
o
_
in
d
ex() t
o
add_fil
e
_to_cache(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Rename
static variable write_index t
o
upda
t
e_in
d
ex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hama
n
o
Rename internal fu
n
ctio
n
"
a
dd_file_to_ca
c
he" in builti
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
i
o
C
H
amano
Propagate
c
ache
e
rror internal
to refresh_cache(
)
v
i
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
i
o
C
Hama
n
o
Fix bogu
s
error m
e
ssage from
merge
-
recu
r
sive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix dependenc
y
of common-cm
d
s
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM spec: inclu
d
e
git-p4 in the list of all
p
ackages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
rerere:
make sorting
r
eally st
a
ble
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix switching to
a
branch w
i
th D/
F
when
c
ur
r
e
nt
b
ranch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
F
ix
twoway_merge that passed d/f
conflic
t
marker t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Fix read-tree
-
-prefix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Ha
m
ano
unpack-trees: get
r
id of *indpos parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ha
m
an
o
unpack_trees
.
c
:
pass unpack_
t
ree
s
_options structure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_cach
e
_entry
(
):
remov
a
l of file foo does n
o
t co
n
flict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ham
a
no
Merge branch 'jc/bise
c
t'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C H
a
mano
Merge bran
c
h
'
fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Ham
a
no
Merge branch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hama
n
o
M
erge branch 'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge b
r
anch
'
p
o
s
t1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Merge
b
ran
c
h '
l
t
/
d
irwalk
'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
git-read-tre
e
--in
d
ex-out
p
ut=<file
>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_G
I
T_INDEX_OUTPU
T
:
all
o
w plumbing
to output to a
n
alt
e
rnativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Hamano
checko
u
t: allow detaching to
HE
A
D even
w
hen swi
t
ching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge 1
.
5
.
0
.
7
i
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hama
n
o
r
e
rere should no
t
repeat the earlier
hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Juni
o
C Hamano
H
opefully final up
d
ate
to
t
he
draf
t
Release Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional Tck/Tk: ignore generated fi
l
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Haman
o
D
o
not bother document
i
ng
fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Haman
o
Update draft rel
e
a
se notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio
C
Ha
m
a
n
o
M
er
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C
H
a
man
o
Merge
b
ranc
h
'
master' o
f
git:
/
/
repo
.
or
.
cz/
g
it/mergetoo
l
.
git
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
i
o C Hamano
Doc
u
mentatio
n
:
un
b
reak user
-
man
u
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
a
mano
GIT 1
.
5
.
1
-
rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
Update main
git
.
html page
to point at 1
.
5
.
0
.
6 documentat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
Merge branc
h
'mai
n
t' to s
y
nchronize w
i
t
h
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
G
IT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hama
n
o
Fix
"--pret
t
y=form
a
t
:
" for
par
e
nt r
e
lated it
e
ms
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next