repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Custom low-level merge driver: change the configuration scheme.
2007-04-18
J
u
nio
C
Hamano
C
u
s
t
om
low-level m
e
rge
driv
e
r: change the confi
g
uration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hama
n
o
Allow th
e
default l
o
w-
l
ev
e
l m
e
r
ge driver to be
c
onfigured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Custom low-lev
e
l
m
erge dr
i
ver sup
p
or
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
Add a de
m
o
n
s
t
r
ation/test of custom
i
z
e
d
m
e
rge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C H
a
mano
Allow spec
i
fying
sp
e
cialize
d
merg
e
-b
a
ckend
per pat
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
merge-re
c
ursi
v
e: sep
a
rate out xd
l
_merg
e
() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
Allow more than true/false
t
o attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C
Hamano
Chang
e
a
ttribute negation
m
arker fro
m
'!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
D
e
fine a built-in attribute macro "b
i
nary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
attribute macro
s
u
p
port
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
Mak
e
file:
a
dd
p
atch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'dif
f
' attribute sem
a
n
t
ics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C
Hamano
Fix 'crl
f
'
attr
i
bute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
T
each 'diff' about 'diff' attr
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C Haman
o
Define 'c
r
l
f
'
a
ttribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add basic inf
r
a
structure
t
o assign
a
ttribut
e
s
t
o p
a
t
h
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Do not default to --no-index when given two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hamano
Merge bran
c
h
'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
Hamano
M
erg
e
b
r
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
Hamano
F
i
x git {log,show,
.
.
.
}
-
-pretty=emai
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
Docu
m
entation: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
i
o
C
Hamano
g
i
t-lo
g
-
-cherry
-
pic
k
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
Refacto
r
patch
-
id filte
r
i
n
g out of
git-cherry
a
n
d git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hama
n
o
Add %m
t
o
'--prett
y
=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fs
c
k: do
n
ot complain
on
d
etached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
i
o C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C
H
amano
Merge branch
'
j
c
/pu
s
h'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hama
n
o
Merge branch '
j
c/merge-subtr
e
e'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Mer
g
e
branch
'
js/f
e
tch
-
progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
m
ano
Add Documen
t
ation/cmd-l
i
s
t
.
made to
.
gitign
o
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 cyc
l
e by prepareing
R
elNo
t
es
for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merg
e
branch 'j
c
/read-tree-d
f
' (early p
a
rt)
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
ma
n
o
M
e
r
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
Prepa
r
e for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A ne
w
merg
e
stra
g
ety '
s
ubtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
g
it-pu
s
h to mu
l
tipl
e
locati
o
ns
does not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
g
it-
p
ush repor
t
s the
URL after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
Merge
b
r
an
c
h 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C H
a
m
ano
Merg
e
branch 'fp/make-j
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'cc/bisect
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merge br
a
nch 'jc
/
checko
u
t' (ear
l
y part)
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C H
a
ma
n
o
D
o
cumentation: t
i
g
h
ten dependenc
y
for git
.
{html,t
x
t
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C
Ham
a
no
git-bi
s
ect: all
o
w bisecting with on
l
y
o
n
e bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
t6030: add
a b
i
t more
t
e
sts to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Juni
o
C Hamano
git-bisect: mode
r
nization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C
H
a
mano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
i
o
C Hamano
Ren
a
me add
_
f
ile_to_inde
x
() to add_file_to_
c
ache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Ha
m
ano
Rename static variable write
_
inde
x
to update
_
inde
x
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C
H
a
m
a
no
Ren
a
me int
e
r
n
al funct
i
on "add_file_t
o
_cach
e
" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Pr
o
pag
a
t
e
c
a
c
h
e erro
r
internal
to
r
efresh_c
a
che() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio
C Ham
a
no
Fix bogus error m
e
ss
a
ge from merge-recursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix dep
e
nde
n
c
y of common
-
cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
H
amano
R
P
M spec: inc
l
u
d
e git-p4 i
n
the list
o
f all pac
k
a
g
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
rerere: make
sorting
r
eally stabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Fix switching to
a
bra
n
c
h
with D/
F
w
h
en curren
t
b
ranch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o
C
Hamano
F
ix twoway_merge that pa
s
sed d/f c
o
nfl
i
ct marker
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C H
a
mano
Fix read-tree --prefix=dir
/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
unp
a
ck-
t
rees: ge
t
r
id of *indpos
p
a
rameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
mano
unpack
_
tre
e
s
.
c: pass unpack_trees_op
t
ions structur
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
a
n
o
add_cache_en
t
ry(): remo
v
al of file foo d
o
es
not co
n
flict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
Hamano
Merge branch 'jc
/
bisect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
m
a
no
Merge branch
'fl/do
c
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merg
e
bra
n
ch 'post1
.
5
.
1/bla
m
e
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
Merge branch 'post1
.
5
.
1/tc
l
tk'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Haman
o
Merge
b
ranc
h
'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hamano
Merge branch
'
lt
/
dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
a
n
o
git-rea
d
-tree --index-o
u
tput=
<
fil
e
>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
_GIT_INDEX_OUTPU
T
:
a
l
l
ow plumbing to
output to an
a
ltern
a
tiv
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
checkout:
a
llow
d
etaching to HEA
D
even when switching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
GI
T
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 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hama
n
o
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Ha
m
ano
r
e
r
ere should not rep
e
at
t
he earli
e
r
h
unks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Ho
p
efull
y
f
i
nal update to
the dr
a
ft Release
N
o
tes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
O
p
tiona
l
Tck/Tk: ig
n
ore g
e
ner
a
ted fil
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Hamano
Do not
b
other documenti
n
g
fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Update draft
r
elease notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
uni
o
C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Ham
a
no
Mer
g
e
b
ranch 'master' of git://repo
.
or
.
c
z
/git/mergetoo
l
.
git
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o
C H
a
mano
D
oc
u
mentation: unbre
a
k user-m
a
nual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
H
a
m
a
no
GI
T
1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o
C
Hamano
Update
main git
.
html page to point
a
t
1
.
5
.
0
.
6 doc
u
mentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
Merge branch
'
maint' to
s
ynchr
o
nize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C Hamano
G
I
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
F
ix
"
--pretty=fo
r
m
at
:
" for parent rela
t
ed items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
g
it-
c
omm
i
t: "read-tree -m HEAD" is no
t
t
h
e
right way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Ham
a
no
sha1_file
.
c (write_sha
1
_fi
l
e): De
t
ect clo
s
e failure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Docume
n
t
git-log --firs
t
-parent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Ha
m
an
o
GI
T
1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
M
e
rge b
r
anc
h
'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o C Hamano
U
pdate R
E
ADME to point a
t
a few
key periodical messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio
C Ham
a
n
o
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch 'ma
i
nt'
o
f
gi
t
:
/
/linux-
n
fs
.
o
rg/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Jun
i
o C Hamano
Merge
b
ranch 'js/remote-show-push
'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ha
m
ano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
next