repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Update 'crlf' attribute semantics.
2007-04-20
Junio
C
Hamano
Update 'crlf' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Docu
m
ent
a
tion:
su
p
port man
u
al secti
o
n (5)
-
file fo
r
mats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io C Haman
o
S
implify c
o
de to
f
i
nd recursive merg
e
d
r
iver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
Hamano
Counto-fix in
merge-
r
ecurs
i
ve
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
mano
Fix f
u
nny ty
p
es u
s
ed
i
n
at
t
ribute value r
e
p
r
esenta
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
A
l
l
o
w low-l
e
vel
d
river
to specify d
i
ffere
n
t behav
i
our
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Cust
o
m low-level merge driver
:
change the configura
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
A
l
low the defaul
t
low-l
e
vel merge driver to be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C
H
a
m
ano
C
ustom lo
w
-level merge dr
i
ver s
u
pport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C
H
amano
Add a dem
o
nstrati
o
n
/test of customized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
Allow spec
i
f
ying sp
e
cia
l
i
zed
merge-backend per
path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
m
e
rge-recursive: separate
out xdl_mer
g
e() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
A
l
low more than
true/
f
als
e
to a
t
trib
u
t
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Ha
m
a
no
Change attr
i
bute negation
mark
e
r from
'!
'
t
o
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Define a built-in at
t
rib
u
te macro "bi
n
ary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
a
ttr
i
bute macro supp
o
rt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile: add patch
-
ids
.
h bac
k
i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o
C Hamano
Fix 'diff' attrib
u
te semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Fix
'
crlf' attri
b
ute se
m
antics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teac
h
'diff
'
about 'diff' attribut
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio
C
H
amano
Define
'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Haman
o
Add basic infras
t
ruct
u
re to assig
n
attri
b
utes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Ham
a
no
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do n
o
t
d
e
fault to --no-inde
x
when g
i
ven tw
o
di
r
ecto
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
H
a
mano
Merge br
a
nch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
J
u
n
i
o
C Hamano
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hama
n
o
F
ix git {lo
g
,show,
.
.
.
}
-
-p
r
etty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C
Hamano
Docum
e
n
t
a
t
i
on: --cher
r
y-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log --ch
e
rry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C
Hamano
R
e
f
a
ctor
p
atch-
i
d filtering out of git-cher
r
y
and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
A
dd %m
to '
-
-p
r
e
tty
=
format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
G
I
T 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 no
t
complain on de
t
ached
HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
i
o C Hamano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Merge branc
h
'
j
c/push'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Merge bran
c
h 'jc/m
e
r
g
e-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
M
erge
b
ra
n
c
h
'js/
f
etc
h
-p
r
og
r
es
s
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
a
n
o
Merge
br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C
Hamano
Add Documentation/cmd-list
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hamano
S
tart 1
.
5
.
2
c
ycle b
y
p
repa
r
eing Rel
N
otes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C
Hamano
Merge branch
'
jc/read-tr
e
e-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
Merge bra
n
ch '
m
a
in
t
'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
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 new me
r
ge stra
g
e
t
y
'
su
b
tree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
gi
t
-push
to multiple loc
a
t
i
ons does n
o
t stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C
Ha
m
ano
git-push re
p
ort
s
t
he
U
RL
a
f
ter failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
M
e
rge
branch 'jc/inde
x
-output
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
M
e
rge branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch
'cc/
b
is
e
c
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge br
a
n
ch 'j
c
/che
c
kout'
(early part)
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
Document
a
ti
o
n:
tight
e
n d
e
pendency for gi
t
.
{
h
t
m
l,
t
xt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
git-bisect
:
allow bisecting
w
ith only one bad com
m
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t60
3
0: a
d
d a bit more te
s
ts
t
o git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Juni
o
C Hamano
git
-
bisec
t
:
modernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hamano
Me
r
ge
b
r
a
nch 'maint
'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename
a
dd_file_to_index() to add
_
file_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Ham
a
no
Rename
static
v
ariable write_index to up
d
ate_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
aman
o
Re
n
a
m
e
i
n
ternal function
"add_file_to
_
ca
c
he" in builti
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C
Hamano
Propagat
e
c
ac
h
e err
o
r
inte
r
nal to refresh_cach
e
(
)
via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
io C Ham
a
no
Fix bogus e
r
ror
message fro
m
m
erge-r
e
cursive
e
r
r
or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fi
x
de
p
endenc
y
o
f common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C H
a
m
ano
RPM
spec:
i
nclude git-p4 in the l
i
st of all pac
k
ag
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere: make so
r
ting really stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix
s
wi
t
chi
n
g t
o
a
branch with D/
F
w
h
en current branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Fix twoway_m
e
r
ge
t
hat passed d/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
H
a
man
o
F
i
x read-tree -
-
p
refix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
u
npack-tre
e
s: get rid
o
f *indpos
parame
t
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
u
npack_trees
.
c
:
pass unpack_tr
e
es_
o
ptions struct
u
re
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
m
ano
a
dd
_
c
ache
_
entry(): re
m
oval of file foo
does not conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Merge
branch 'jc/bisec
t
'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
mano
Me
r
ge b
r
anch '
f
l
/
doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Me
r
ge branch
'
post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
Me
r
ge branch 'post
1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
M
e
rge bran
c
h
'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C Hamano
Merge branch 'lt/dirwal
k
'
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C Hamano
g
it-read-t
r
ee
--index-output=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_GIT_
I
ND
E
X
_
OUTPUT: allow plumbing to output
to an alternat
i
v
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
check
o
ut: allow det
a
ch
i
ng to HEAD even when switch
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C H
a
mano
GI
T
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio 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
Jun
i
o C
H
am
a
no
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
rerere s
h
o
ul
d
not repeat the earlier hunks i
n
later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
J
unio C Hamano
H
o
peful
l
y fin
a
l u
p
date
to the
draf
t
R
elease Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional Tck/Tk: ig
n
ore gen
e
rated
files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Hama
n
o
Do not
bother documenting fetch--too
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C Hamano
Upda
t
e 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
Ha
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Mer
g
e branch 'mas
t
e
r
'
o
f git:
/
/repo
.
or
.
cz/git
/
merget
o
ol
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Ham
a
no
D
ocum
e
nt
a
tion
:
unbreak user-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Ha
m
a
n
o
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C H
a
man
o
Update main git
.
htm
l
p
a
ge to point at 1
.
5
.
0
.
6 documen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
uni
o
C
Hamano
Mer
g
e b
r
anc
h
'm
a
i
n
t
'
to synchro
n
ize
with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
G
I
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C Hamano
Fix "--pretty=fo
r
ma
t
:"
f
or parent rel
a
ted it
e
m
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hamano
git-c
o
mmit: "read-tree -m HEAD"
i
s not the right
w
ay
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jun
i
o C Hamano
sha1_file
.
c
(
w
rite_sh
a
1_file): Detect
clos
e
fail
u
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jun
i
o C
Hama
n
o
Document g
i
t
-log --first
-
parent
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
next