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
Document gitattributes(5)
2007-04-20
J
u
nio C
H
amano
Document git
a
tt
r
ib
u
tes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Hamano
Up
d
ate 'crlf' attri
b
ute
s
e
man
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Documenta
t
ion: support manual sectio
n
(5) - f
i
le f
o
r
m
ats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io C Ham
a
no
Si
m
plify code t
o
f
i
nd recursive merge dri
v
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Hama
n
o
C
o
u
nto-fix in merge-recursi
v
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Fix
funny type
s
used in attribute value
representation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow low-level driver to specify diff
e
r
ent b
e
ha
v
iour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
H
amano
Custom low-level me
r
ge driver: c
h
ange the conf
i
guration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o C Hamano
A
llow the default low-level merge driv
e
r to be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Custom low
-
level merge driver
s
upport
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Add
a demonstrat
i
on/test of customized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
H
amano
Allow specifying specialized mer
g
e-
b
ackend
p
er path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
io C Hamano
m
e
rge-recur
s
iv
e
: se
p
a
r
at
e
out xdl_
m
erg
e
()
interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Allow
m
or
e
than true/false to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
C
hange a
t
tribute negation
marker fro
m
'!
'
to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Define a
built-in attribute macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
aman
o
attribute m
a
cro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
H
amano
M
a
kefile: add patch-id
s
.
h
back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hama
n
o
Fi
x
'diff' attribute sema
n
tics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C
Hamano
Fi
x
'
crlf
'
a
ttribute
s
e
mant
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Teach 'diff' about
'
d
i
ff' attrib
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C Haman
o
Define 'c
r
lf
'
attr
i
b
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
A
d
d basic infrastruct
u
re to assign attributes
to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
n
o
Merge b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
D
o
not default to --
n
o-ind
e
x
w
hen given two dire
c
tories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branch 'jc/ch
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
aman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Haman
o
Fix git {lo
g
,show
,
.
.
.
}
-
-pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Do
c
umentation: --
c
herry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log
--cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C
H
ama
n
o
Ref
a
ctor patch-id filtering out of git-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hama
n
o
Add %m to '-
-
prett
y
=
f
ormat:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
J
unio C Hamano
fsck: do not com
p
lain o
n
detached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
Merge
bran
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C H
a
m
a
no
Me
r
ge branch
'
jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hama
n
o
M
e
rge br
a
nch 'j
c
/merge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch '
j
s/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Merge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Documen
t
ation/cm
d
-l
i
st
.
m
ade
t
o
.
gi
t
ignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
Star
t
1
.
5
.
2 cycle by pr
e
pareing RelNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge bran
c
h 'jc/r
e
ad
-
tre
e
-d
f
'
(early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Prep
a
re for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Ha
m
ano
A
new mer
g
e
s
tragety 'su
b
t
ree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o
C Hamano
git-push to mu
l
tiple loca
t
i
o
n
s
d
oes not stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hama
n
o
gi
t
-push reports the
U
RL after
failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hama
n
o
M
erge branc
h
'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Merge branch 'f
p
/m
a
ke-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge branch 'cc/bisect
'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Merge branch
'
jc/
c
heck
o
ut' (early part)
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
amano
Docume
n
tation: tigh
t
e
n dependency for git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
un
i
o C
H
a
m
a
n
o
git-b
i
se
c
t: a
l
low
b
isecting with only
o
ne bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hama
n
o
t6030: add a bit
more tests to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
J
u
nio C Hama
n
o
git-bisect: moderniza
t
io
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
M
e
rge
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C
Hamano
Rename add_file_to_index() to a
d
d_
f
ile
_
to_cac
h
e()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename sta
t
ic v
a
r
iable wri
t
e_in
d
ex to update_i
n
dex
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Ren
a
me
i
nt
e
rn
a
l
f
unct
i
o
n
"a
d
d
_file_to_cache
"
in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Haman
o
Propagate cache error internal to
r
efresh
_
cache() v
i
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
F
i
x
bogus error message
fr
o
m merge-re
c
ursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Fix dependenc
y
of co
m
mon-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM spec:
i
nclu
d
e git-p
4
in the list of al
l
pac
k
ages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C H
a
mano
rerere: mak
e
sorting
really
stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hama
n
o
Fix switching to a branch with D/F
w
hen current
branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
H
ama
n
o
F
ix
t
woway
_
merg
e
that pa
s
s
e
d d/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix re
a
d-tree --prefix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C H
a
mano
unp
a
ck-trees:
g
et rid
of *in
d
pos parameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C H
a
mano
unpack_trees
.
c: pass
u
npack_trees_options structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
H
amano
add_
c
a
che_entr
y
(): rem
o
val o
f
file f
o
o
does not con
f
lict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
Hamano
Merge b
r
anch
'
jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Merg
e
branch 'fl/doc
'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merge branch '
p
o
s
t1
.
5
.
1
/blam
e
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Merge branch 'po
s
t
1
.
5
.
1/t
c
l
t
k'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
M
e
rge b
r
an
c
h
'
p
os
t
1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hama
n
o
Merge branch 'lt
/
di
r
w
a
lk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git
-
r
e
ad-tree --i
n
d
e
x-o
u
tput=
<
file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
_GIT_INDEX_OUTPUT: allow plumbin
g
to output to an alternat
i
v
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
checko
u
t: allow de
t
aching t
o
H
E
AD
e
ven when switching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ham
a
no
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Merge
1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C H
a
mano
GIT 1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Haman
o
rerer
e
s
h
oul
d
n
ot r
e
pe
a
t the earlier
h
unks i
n
later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
J
u
nio C Hamano
H
o
pefully f
i
nal upda
t
e to the
dr
a
ft
Release Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional Tck/T
k
: i
g
nore generated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o
C
Hamano
D
o not b
o
t
h
er documen
t
ing fetch-
-
t
o
o
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C H
a
mano
Update draft releas
e
notes for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Ham
a
no
M
e
r
g
e b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C
H
aman
o
Merge branc
h
'mas
t
er' of git://repo
.
o
r
.
cz/
g
it/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
i
o C
H
ama
n
o
D
ocumentation: unbreak
u
ser-manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
G
I
T 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
Updat
e
m
ain git
.
html page to point
a
t 1
.
5
.
0
.
6
documentat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Haman
o
Merge branch '
m
ain
t
' to synchroniz
e
wi
t
h 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io
C
Hamano
F
ix "-
-
p
r
et
t
y=f
o
rmat:"
for parent
r
e
lated items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
git-commi
t
: "read-tree -m HEAD"
i
s not
t
he right
way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
sha1_file
.
c (
w
rite_sha1_file)
:
Det
e
ct
close
failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C Hamano
Document git-log --first
-
p
a
rent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next