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
Document gitattributes(5)
2007-04-20
Junio C
Haman
o
Document gitattribu
t
es(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C H
a
mano
U
pdate 'crlf' attrib
u
t
e
semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Haman
o
Documentat
i
on: support manual sec
t
ion (
5
) - f
i
le formats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io C
Ha
m
a
no
S
imp
l
i
f
y
code
to find recursive
m
e
r
ge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hama
n
o
Counto-f
i
x in merge
-
recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Fix funny ty
p
es used
in attribu
t
e va
l
ue representatio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C Hama
n
o
A
l
l
o
w
low-lev
e
l driver to specify diffe
r
ent behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Custom
lo
w
-level mer
g
e dr
i
v
er: change the con
f
igur
a
tio
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Allow
t
he
d
efault low-
l
evel m
e
rge driver
to be confi
g
ured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ha
m
ano
Cus
t
om low-level
m
erge d
r
i
ver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
Add a demon
s
tration/test
o
f cu
s
tomized me
r
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
H
amano
All
o
w specif
y
ing specialized merge-backend per
path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-recursive: separat
e
out xdl_merge() int
e
r
f
a
c
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Ha
m
an
o
A
l
low more than tr
u
e/fal
s
e to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Change
at
t
ribute negation marker from '!'
t
o '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Defi
n
e a b
u
ilt-in attribu
t
e macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
attribute macro sup
p
ort
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C Hamano
Makefile:
a
dd
p
atch-id
s
.
h back i
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
F
i
x 'diff
'
a
t
tribute
s
ema
n
t
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C Hamano
Fix '
c
r
l
f' attribute semant
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
Teach 'diff
'
a
bout
'diff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define
'
crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Add basic infrastr
u
cture t
o
assi
g
n attributes to
p
ath
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Me
r
ge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Ham
a
no
Do not d
e
f
a
ult to --no-index w
h
en gi
v
en t
w
o dire
c
t
o
r
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branc
h
'jc/c
h
erry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
Merg
e
branch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-13
Junio C H
a
mano
Fix git
{log,show,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Docum
e
ntation: --che
r
ry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
i
o C Hama
n
o
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 Ha
m
ano
Refactor pat
c
h-id filtering o
u
t of git-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
A
dd %m to '--prett
y
=for
m
at:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
Merge
branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-12
J
unio C
Hama
n
o
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
J
unio C Hamano
f
s
ck: do not complain on detach
e
d HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C
H
amano
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'j
c
/push'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Haman
o
Merge branc
h
'
j
c/merge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge b
r
a
n
ch '
j
s/fetch-progres
s
'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C H
a
m
a
no
Merg
e
branch
'
maint
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
Add
Documentation/cmd-list
.
made
to
.
g
itig
n
o
re
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Haman
o
Sta
r
t 1
.
5
.
2
cycle by pr
e
pareing RelNo
t
es f
o
r it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io
C Ham
a
no
Me
r
ge branc
h
'jc/re
a
d-tre
e
-
d
f' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
a
mano
P
repa
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 merge stragety 'subt
r
ee
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C H
a
mano
git-push t
o
mu
l
t
iple l
o
cations does
n
ot stop at th
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push reports t
h
e URL after f
a
iling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merge
branch '
j
c
/ind
e
x-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merge branch 'fp/make-j
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merge branch
'
cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hama
n
o
Merge branch 'jc/ch
e
c
kout' (e
a
rly part)
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
D
o
cu
m
entation:
t
ighten dep
e
ndency for git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
mano
git-bisect: al
l
ow bisecting with
o
nly on
e
bad com
m
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
t60
3
0: add a b
i
t more te
s
t
s
to git-bisec
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-bisect: modernization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
R
e
n
a
me add_file_to_index()
to
a
d
d
_file
_
to_ca
c
he()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
ni
o
C Hamano
Rename sta
t
ic variable write_index to update_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C H
a
m
ano
Rename internal function "ad
d
_file_to_cache
"
in bui
l
tin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
P
ropagate cache er
r
or internal to ref
r
e
s
h
_
c
ache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
H
amano
Fi
x
bogus error
messag
e
from merge-recu
r
s
i
ve error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
F
ix depe
n
d
en
c
y of co
m
mon-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C H
a
mano
RPM spec: incl
u
de git-p4 in the list of a
l
l
packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
aman
o
rerere: make
sorting really stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix swit
c
hing t
o
a branch with
D/F
when c
u
r
r
e
nt branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hama
n
o
Fix twoway_me
r
ge that pas
s
ed d/
f
co
n
flict
m
a
rker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Fix
r
ead-tree --prefix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack-trees:
g
et rid of
*
i
n
dpos param
e
ter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
unpack_t
r
ees
.
c: pass u
n
pack_trees_opt
i
ons structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
add
_
cache_entry(): remova
l
of file foo d
o
es not conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C Hamano
M
erge
b
ranch 'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Merge branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C Hama
n
o
Mer
g
e
b
ranc
h
'pos
t
1
.
5
.
1/b
l
a
me
.
el
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
Merge
branch
'
p
o
s
t1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge
b
ranch
'
p
o
st
1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'lt/di
r
walk'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
git
-
read-tree --inde
x
-output=<fil
e
>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
_
GIT_INDE
X
_OUTPUT: allow plumbing to output to an a
l
ter
n
a
t
iv
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
check
o
ut: all
o
w de
t
aching to HEA
D
e
v
en 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
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
G
I
T
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere should
n
ot
repeat the earlier hunks in la
t
er
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Juni
o
C Hamano
H
opefu
l
ly final up
d
ate to the
d
r
a
ft Release N
o
tes
,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional Tck/Tk: ignore g
e
n
e
rat
e
d fil
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
H
amano
Do
not bother d
o
cume
n
ting fetch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Hamano
Update draft
release
n
otes for
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Hamano
Merge branch 'mast
e
r' of
g
it://repo
.
or
.
c
z/git/m
e
r
g
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
D
ocumen
t
ation: unbreak user
-
ma
n
u
a
l
.
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
Ha
m
ano
Update main git
.
h
tml pa
g
e t
o
point at 1
.
5
.
0
.
6 documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
Merge branch 'maint' to synchron
i
ze with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ham
a
no
Fi
x
"-
-
pretty=format:" for pa
r
e
n
t r
e
l
ated item
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C H
a
mano
git
-
commit:
"
r
e
a
d-tre
e
-m
H
EAD
"
i
s
n
ot t
h
e right way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Haman
o
sha1_file
.
c (write_sha1_file): D
e
tect close fa
i
lure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C
Hamano
Do
c
u
ment
g
i
t
-log
-
-first-parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next
