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
Fix funny types used in attribute value representation
2007-04-18
Junio
C Ham
a
no
Fix funny types used i
n
at
t
rib
u
t
e
val
u
e
r
e
presentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Allow low-level driver
to specif
y
differen
t
behav
i
our
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o
C H
a
ma
n
o
Custom low-level
merge driver:
change 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
l
ow-level mer
g
e driv
e
r to be c
o
nfigure
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hama
n
o
Custom low-level me
r
ge d
r
iver
support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Ham
a
no
Ad
d
a demon
s
tration
/
t
e
st of cu
s
t
omiz
e
d mer
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
Allow s
p
ecifying spe
c
ialized
merge-backend per
pa
t
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Ham
a
n
o
merge-recursive: separ
a
te out xdl_
m
e
rge() inte
r
fac
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
A
l
l
o
w more than true
/
false to a
t
tributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C
H
aman
o
C
h
an
g
e a
t
tribute negation mar
k
er from '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C
H
amano
Defi
n
e
a built-in attribute
mac
r
o "bi
n
ary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
attrib
u
te m
a
cr
o
support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
M
a
kefile: add p
a
tch-ids
.
h
b
a
ck in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'd
i
ff' attribute seman
t
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C Hamano
Fix
'crlf'
a
ttribu
t
e
sem
a
ntics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C
Ha
m
a
n
o
Teach 'diff
'
about
'diff' attrib
u
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
Defin
e
'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Add basic
i
nfrastructure
t
o
as
s
ig
n
attribu
t
es to p
a
ths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Merge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C Hamano
Do no
t
d
e
f
a
ult to --no
-
index when
g
iven two
directorie
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
M
erge branc
h
'jc
/
ch
e
r
r
y'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
Mer
g
e branch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C Hama
n
o
Fix
g
it
{log
,
show,
.
.
.
} --p
r
etty=ema
i
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Documentati
o
n: --c
h
erry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Ha
m
a
no
git-log --che
r
ry-p
i
c
k A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
Re
f
actor patch-id filteri
n
g out of git-cher
r
y a
n
d
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
A
d
d %m t
o
'--pr
e
tty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
Merge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C Ha
m
a
n
o
GIT
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Ju
n
io C
Hamano
fsck:
do not complain on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
Merge branch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Merge branch 'j
c
/
p
ush'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
i
o C Haman
o
Merge branc
h
'jc/merge-subtr
e
e'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
man
o
Merge branch
'js/fetch-progr
e
ss'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
M
erge
b
ra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
m
ano
Add Doc
u
mentation/cmd-lis
t
.
made to
.
giti
g
nore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
S
t
art
1
.
5
.
2 cyc
l
e by prepareing RelNot
e
s for
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Haman
o
Merge branch '
j
c/read-tree-df
'
(early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
M
e
r
ge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
P
repare 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
s
tragety
'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
git-pus
h
to multiple
locati
o
ns does not
stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push repor
t
s the U
R
L aft
e
r fai
l
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
M
erge
br
a
nch 'jc/index-
o
u
t
p
u
t'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
Ha
m
ano
Merge bra
n
c
h
'
fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Mer
g
e branch 'cc
/
b
i
sect
'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C
Hamano
Mer
g
e branch '
j
c/
c
hecko
u
t' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
M
erge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
Documentat
i
on
:
tig
h
ten d
e
pende
n
cy for git
.
{htm
l
,t
x
t}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hama
n
o
g
it-bisect: allow bis
e
cting
w
ith
o
nl
y
on
e
bad com
m
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
t6
0
30:
add a bit
m
ore tests to git-b
i
sec
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
J
unio C Ha
m
ano
git-bisect: modernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Merge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio
C
Ham
a
no
Rename add_file_to_index() to add_fi
l
e_to
_
cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
R
e
name static variable write_index to updat
e
_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
R
ename intern
a
l fu
n
ction "add_file_to_
c
ac
h
e
"
in buil
t
in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
a
mano
P
rop
a
gat
e
cache error internal
t
o re
f
resh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
ni
o
C Hamano
Fix bogus error mess
a
ge from
m
erge-
r
ecursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
F
ix
d
ependency of com
m
on-c
m
ds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
R
PM
spec: inc
l
u
d
e git-p4
i
n the list
of all
pack
a
ges
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
r
erere: make
s
ort
i
ng really stab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix switching to a bran
c
h
w
ith
D
/
F when c
u
r
r
e
n
t
branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
H
amano
Fix tw
o
way_merge that passed d/f c
o
nflict
m
arker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix read-tree --prefix=d
i
r/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
un
i
o C
Haman
o
unpack-trees:
g
et
r
id of *indpos
parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
H
aman
o
u
n
pack_trees
.
c: pass unpack_trees_options stru
c
ture
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ha
m
a
no
add_cache_entry():
r
e
moval of file fo
o
do
e
s not conf
l
i
ct
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
Hamano
Merge branc
h
'jc/bis
e
ct
'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C Ha
m
ano
Merge
branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Hamano
Mer
g
e branch 'post1
.
5
.
1/b
l
ame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Merge br
a
nch 'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Me
r
ge branch 'post1
.
5
.
1
/
p4'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Merge branch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hama
n
o
gi
t
-read-tree --index-output=<
f
ile>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
_GIT_INDEX_OUTPUT: allow plum
b
ing to outp
u
t to an al
t
er
n
ati
v
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
c
hec
k
out: all
o
w d
e
taching
t
o
H
E
AD even w
h
en switch
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o
C Ha
m
ano
G
I
T 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hama
n
o
Mer
g
e 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Ha
m
ano
r
e
rer
e
should not
rep
e
at th
e
earlier hunk
s
in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
J
unio
C
Hama
n
o
Hopefully
f
in
a
l update
to the draft Relea
s
e
Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio
C
H
a
m
a
no
Optional Tck/Tk: ig
n
ore generated fi
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Haman
o
Do not bot
h
er documentin
g
fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Update draft release note
s
for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Haman
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Haman
o
Merge
b
ranch 'ma
s
t
e
r' of git://repo
.
o
r
.
c
z
/git/m
e
rgetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C
Hamano
Documentation: unb
r
eak
use
r
-m
a
nual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT
1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Update main
git
.
html
page
t
o
point at 1
.
5
.
0
.
6 docum
e
ntat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
Merg
e
b
ranch
'maint'
t
o
s
ynchr
o
nize
w
ith 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ham
a
no
Fix "--
p
retty=format:" f
o
r parent
re
l
at
e
d i
t
ems
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
git-commit: "
r
ead-t
r
ee -m HEAD" is not
the
r
ight way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
uni
o
C
H
amano
sha
1
_file
.
c (write_
s
ha1_f
i
le)
:
Detect c
l
ose
f
a
ilure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C
Hamano
Docu
m
ent gi
t
-lo
g
--first-parent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C
Hamano
GIT
1
.
5
.
1-rc
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o C Hamano
Merge
b
ranch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o
C Hamano
U
p
date READ
M
E to p
o
int at a few key periodica
l
messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch 'maint'
o
f git://linux-nfs
.
org/~
b
fie
l
ds
.
.
.
commit
|
commitdiff
|
tree
next