repo.or.cz
/
alt-git.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
J
u
n
io C
Ham
a
no
F
ix funny
t
ype
s
used in attribu
t
e
value rep
r
ese
n
ta
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Al
l
ow low-level d
r
iver to
s
pecify
d
i
f
f
e
r
e
nt behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Cu
s
to
m
lo
w
-level merge driver: change the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C Hamano
Allow the
d
e
fault low-le
v
el
merge driver t
o
be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
ni
o
C Ha
m
an
o
Custo
m
low-
l
evel merg
e
d
river support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
d
d a dem
o
ns
t
r
a
tion/test of
customized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
m
a
n
o
Allow specifying
s
pe
c
i
alized
me
r
ge-backend per p
a
t
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
i
o C Ham
a
no
m
erge-
r
ec
u
rsive: separat
e
out xdl_mer
g
e(
)
interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Haman
o
A
l
low
more than tru
e
/false to a
t
tributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
Chang
e
attribute
n
egati
o
n
m
a
rker from '
!
'
to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Define
a bu
i
lt-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 support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Make
f
ile: a
d
d patch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'diff' attrib
u
t
e
semanti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
F
ix 'crlf' at
t
r
ibu
t
e semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Teach 'diff' about
'diff' at
t
ribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define 'cr
l
f' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Add b
a
sic infr
a
st
r
u
c
ture to assign att
r
i
b
ut
e
s to pa
t
hs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merg
e
branch
'
main
t
'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do
n
ot
default to --no-i
n
dex when given two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Merge branch
'
jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
i
o C Hamano
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git {log,s
h
ow,
.
.
.
}
-
-pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Do
c
umentation
:
--che
r
ry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Ham
a
no
git-log --cherry-pi
c
k A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
Refactor
patch
-
id filtering out of
g
it
-
c
herry and
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Add %m to '--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Mer
g
e b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C
Ham
a
no
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
amano
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Merge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge br
a
n
c
h 'jc/me
r
ge-su
b
t
r
ee'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
am
a
no
Merg
e
branch
'js/fetch-progress
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
aman
o
M
e
rge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Add Do
c
um
e
ntation/cmd-lis
t
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
S
ta
r
t 1
.
5
.
2 cycle by prepareing Re
l
Not
e
s for
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Ha
m
ano
M
erge bran
c
h 'jc/read-tree
-
df' (e
a
rly
p
art)
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
i
o
C
H
amano
Prepare for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new merge stragety 'sub
t
ree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C H
a
mano
git-
p
us
h
t
o
m
ult
i
ple
location
s
does not stop at t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Ham
a
no
git-pus
h
reports the URL after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
Merge branch 'jc/in
d
ex-output'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C
H
amano
Merge branc
h
'
fp/m
a
ke-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
M
erge bra
n
ch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
bra
n
ch '
j
c/check
o
u
t
' (ear
l
y p
a
rt)
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
M
erge b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
Docum
e
n
ta
t
ion: tighten d
e
pendency
f
or
git
.
{htm
l
,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
git-bisect: allow bis
e
cting
w
ith o
n
ly one bad c
o
mmit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
n
o
t6
0
3
0
: add a bit more tests to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Juni
o
C Hamano
gi
t
-bisect: mode
r
n
i
zati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio
C
H
a
mano
Rename add_file_to_index() t
o
add
_
fil
e
_t
o
_cach
e
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio
C H
a
mano
R
e
name static vari
a
b
le write_index t
o
updat
e
_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C
H
am
a
no
Renam
e
internal function "add_file_to
_
cache" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Propaga
t
e cache error internal to refresh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix
bogus er
r
or
message fr
o
m me
r
ge
-
re
c
ursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix dependency of
commo
n
-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
RPM spec: inclu
d
e gi
t
-
p
4
i
n
t
he list of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
rere
r
e:
make sorting real
l
y stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix switchi
n
g to a
br
a
n
ch with
D
/F wh
e
n
current br
a
nch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Fix t
w
oway_merge t
h
at passed d
/
f
c
onflict marker 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
Junio
C
Hamano
unpac
k
-trees: get rid of *in
d
pos parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
unpack_trees
.
c
:
p
a
s
s
u
npack_tr
e
es_options st
r
ucture
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Haman
o
ad
d
_c
a
che_e
n
t
r
y
():
removal of f
i
le foo
d
oes not conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
erg
e
b
ranch 'jc/bisec
t
'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
Haman
o
Merge
b
ranc
h
'fl/do
c
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch
'
post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C H
a
mano
Merge
branch 'post1
.
5
.
1
/
tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
aman
o
Merge
branc
h
'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Mer
g
e branch
'lt
/
d
i
rwalk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Ham
a
no
git-read-tree --index-out
p
ut=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_GIT
_
INDEX_OUTPUT: al
l
ow
p
lu
m
bing to ou
t
pu
t
t
o
an alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C Ham
a
no
checkou
t
: allo
w
detaching to HE
A
D 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
H
aman
o
Merg
e
1
.
5
.
0
.
7 in
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 H
a
mano
rerere
s
hould
n
o
t
repeat the earlier hu
n
k
s i
n
lat
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C H
a
mano
Hopef
u
lly fi
n
al
update to t
h
e draf
t
Release
Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio
C
H
amano
Opti
o
nal Tck/Tk: ig
n
or
e
ge
n
e
r
a
t
e
d
f
i
le
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Haman
o
Do
n
ot
bother docum
e
n
ting fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
unio C Hama
n
o
Update draft re
l
eas
e
note
s
f
o
r 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C Ha
m
ano
Mer
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
M
erge branc
h
'master' of git://repo
.
o
r
.
cz/git/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Documentati
o
n: unbreak use
r
-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hama
n
o
G
I
T 1
.
5
.
1
-
rc3
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C
H
amano
Update
main git
.
ht
m
l
page to poi
n
t
a
t 1
.
5
.
0
.
6 document
a
tio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Merge branch 'maint'
t
o sy
n
chronize 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
Junio C Hamano
F
i
x
"
--
p
r
e
tt
y
=format:" for parent
r
elated items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
g
i
t-commit: "read-tree -m
H
EAD" is not the right
w
ay
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jun
i
o
C
Ham
a
no
sha1_fil
e
.
c
(
w
r
ite_sha
1
_file): Detect close fail
u
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Document git-
l
og --
f
i
r
st-paren
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C
H
a
m
an
o
Merge branch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
U
p
date R
E
ADME to po
i
nt at a few key periodical message
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
io C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
J
uni
o
C
Hamano
Merge branc
h
'ma
i
n
t
' of git://lin
u
x-nfs
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
next