repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
convert.c: restructure the attribute checking part.
2007-04-21
Junio C Hamano
convert
.
c: restruc
t
ure t
h
e attribute ch
e
cking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
a
m
ano
Fix
bogus l
i
nked-list man
a
gem
e
nt for
u
ser defi
n
ed merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
Do
c
ument gitattribut
e
s
(
5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Update 'crlf'
a
t
t
r
ibu
t
e s
e
mantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hama
n
o
Docum
e
ntation: support manual sec
t
ion (5) - fil
e
formats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C
H
amano
Si
m
pl
i
fy
c
o
d
e
to f
i
nd r
e
cursive merg
e
driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
mano
Co
u
nto-fix i
n
merge-recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C
H
amano
Fix fu
n
ny types u
s
ed in
a
ttribute value represen
t
a
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow low-level driver to specify dif
f
erent behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Cus
t
om low
-
l
evel merge
dri
v
e
r
: chan
g
e t
h
e conf
i
g
u
ration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow the default low-level merge dri
v
er to
be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Cu
s
tom lo
w
-level me
r
ge driver suppo
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
Hamano
Add a de
m
ons
t
ration/te
s
t of c
u
stomized m
e
rge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
l
low s
p
ecifying special
i
zed merge-backend
pe
r
path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
m
ano
merge-rec
u
rsive: separate out xdl_merge()
inter
f
ace
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Haman
o
Allow
m
o
re than true/f
a
lse to
att
r
ibu
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C
H
a
m
ano
Ch
a
nge attribute n
e
g
ation marke
r
from
'!' to '-
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
D
e
fine a bui
l
t-in at
t
ribute macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attrib
u
te macro
s
upport
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Make
f
i
l
e: ad
d
patch-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Ha
m
an
o
Fix 'diff
'
a
ttribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
uni
o
C Hamano
F
i
x 'crlf' at
t
ribu
t
e semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C H
a
m
a
n
o
Teach
'
diff' about 'diff'
att
r
ibute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
ano
Define 'crlf' a
t
tribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Ha
m
a
n
o
Add bas
i
c infrastructure
to assign attributes to
p
ath
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
io C
H
a
mano
D
o
n
o
t
d
ef
a
ult to --no-in
d
ex when given
two
d
irectories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C Hamano
Merge bra
n
ch 'jc/cherry
'
commit
|
commitdiff
|
tree
2007-04-13
J
uni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix
git {log,show,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
D
ocume
n
t
a
tion: --c
h
erry
-
pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
un
i
o C Hamano
git-log --
c
herry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refac
t
o
r patch-id filteri
n
g out of git-
c
he
r
ry and g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
i
o C Hamano
Add %m to '--pretty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
Merge 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 Haman
o
fsck:
d
o no
t
complain on
d
etached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ha
m
an
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
aman
o
Merge branch 'jc
/
push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merg
e
b
r
anch 'jc/merge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Merge bran
c
h 'js/fetch-prog
r
ess'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C
Ham
a
no
Merge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add D
o
cument
a
ti
o
n
/
cmd-
l
ist
.
m
ade to
.
g
itignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
St
a
rt
1
.
5
.
2
c
yc
l
e by
prepa
r
ei
n
g R
e
l
N
otes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
io C
H
amano
Merge
branch
'jc
/
read-tree-
d
f'
(ea
r
ly
p
art)
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
H
a
mano
Pre
p
are for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
A new
me
r
ge s
t
r
aget
y
'sub
t
ree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C H
a
mano
g
i
t-push to mult
i
pl
e
locations does not
stop at th
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Haman
o
git-push rep
o
rts
the URL
a
fter fa
i
ling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Merge b
r
a
n
c
h 'jc/index-outpu
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'fp/mak
e
-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge br
a
nch 'cc
/
bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
ma
n
o
M
er
g
e bra
n
c
h 'j
c
/
chec
k
ou
t
' (early p
a
rt)
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C Hamano
Merge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Documentatio
n
: tighten dependen
c
y f
o
r git
.
{html,
t
x
t
}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hama
n
o
g
it-bisect: allow
b
isecting with
only one bad c
o
mmit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
t6030:
a
dd a b
i
t
m
ore tests to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
J
unio
C
Hamano
git-bisect
:
modernizatio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
a
mano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
i
o C Hama
n
o
Rename add_
f
ile_to_index
(
) to add_file_to_cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
H
a
ma
n
o
Rena
m
e static var
i
able write_index t
o
upda
t
e_inde
x
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename internal function "add_f
i
le_to_cac
h
e" in built
i
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Propagate cache error internal t
o
refresh_cache
(
) via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Ha
m
ano
Fix bogu
s
e
rr
o
r messa
g
e from
mer
g
e-
r
ecursi
v
e
error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hama
n
o
F
i
x dependency of common-cm
d
s
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
amano
RPM spec: include git-p4 in the
l
is
t
of all packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere: ma
k
e sorting really stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Hamano
Fix switc
h
ing to
a
branch wi
t
h
D
/F when c
u
rrent br
a
nch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o C Hamano
Fix twoway_merge
t
hat
p
assed d/f
c
onf
l
ic
t
marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hamano
F
i
x re
a
d
-
tr
e
e --prefi
x
=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
aman
o
u
npack-t
r
ees: get rid of
*
indpos pa
r
amete
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
unpack
_
tree
s
.
c: pass unpack
_
tr
e
es_options s
t
r
u
c
ture
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
add_cache_entry(): removal
of
f
ile
foo do
e
s
not conf
l
i
c
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
e
rge
branch 'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branc
h
'
f
l
/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge
branch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o
C Ham
a
no
Mer
g
e
branch 'p
o
s
t
1
.
5
.
1/tcltk
'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
H
amano
Mer
g
e branch 'p
o
st1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'lt/dirwa
l
k'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Haman
o
git-rea
d
-tree --ind
e
x-output=<fi
l
e>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
_GIT_
I
NDEX_OUTPUT: allow plumbing
t
o output to an alternativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o
C Hamano
che
c
kout: allow
detaching to HEAD even when switching
.
.
.
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 Ham
a
no
Merge
1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o
C Hamano
GIT
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
rerere
s
ho
u
ld not repeat
the earlier
h
unks in
l
ater
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
J
unio C Hamano
Hope
f
ull
y
f
inal update to t
h
e dr
a
ft Relea
s
e Not
e
s,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional Tck/Tk: ign
o
re gen
e
rate
d
files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ha
m
a
no
D
o
not bother docume
n
ting fetc
h
--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C
H
amano
Up
d
ate draft release not
e
s
f
o
r 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hama
n
o
Merge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Me
r
ge br
a
nch '
m
aster
'
o
f g
i
t://rep
o
.
o
r
.
cz/git/mergetool
.
g
i
t
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
ama
n
o
D
o
cumenta
t
i
o
n: unbrea
k
u
s
er-manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C
Ham
a
no
GIT 1
.
5
.
1-rc
3
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Ha
m
ano
U
pdate main gi
t
.
h
tml page to point at
1
.
5
.
0
.
6 do
c
umentat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ham
a
no
Merge b
r
anch 'maint' to syn
c
h
r
onize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GI
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C
H
a
m
a
n
o
Fix "--pretty=format:" for parent relat
e
d items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
git-c
o
m
mit: "
r
ead-tree -m HEAD" is not the rig
h
t way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next