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
Documentation/Makefile: fix section (5) installation
2007-04-22
J
u
nio C Hamano
D
ocumentation/Makefile
:
fix
s
e
c
tion (5) installation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update docum
e
nta
t
i
o
n
l
in
k
s to
p
o
int at v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Mer
g
e branch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge br
a
n
c
h 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge br
a
nch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
erge
bran
c
h 'lt/git
l
ink'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C H
a
mano
Merge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio
C Ham
a
no
Merge branch 'jp/re
f
s
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Merg
e
b
ranch 'jc/qui
c
kfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hama
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Hamano
lo
c
k
f
ile: recor
d
t
he primary pr
o
ce
s
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
convert
.
c: re
s
tructur
e
the at
t
r
i
bute che
c
king part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
F
i
x
bogus
l
inked
-
l
ist manag
e
ment fo
r
us
e
r de
f
i
n
ed mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Ha
m
ano
g
i
t-cl
o
ne:
fi
x
d
u
m
b
protocol
transport t
o
clo
n
e from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C H
a
mano
git-add -u
:
match th
e
index with
workin
g
tr
e
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
H
aman
o
Document gitatt
r
ibutes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
Up
d
ate 'crlf' attribute
s
emantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Docu
m
e
nt
a
tion:
s
u
p
p
ort manual section (5) - file formats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
J
u
n
i
o C Hamano
Simp
l
i
f
y code
t
o
f
ind re
c
ursive merge
driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
Hamano
Counto-fix in merge-recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
M
e
r
ge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Fix funny types used in attribute v
a
lue re
p
resentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C
H
a
mano
All
o
w low
-
leve
l
drive
r
to s
p
ec
i
fy di
f
ferent behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C H
a
mano
Custom low-lev
e
l merge driver: c
h
ange the configu
r
ation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Allow
t
h
e default low-l
e
vel merge driver t
o
be confi
g
ured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
C
usto
m
l
o
w-level merge driver
support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o C
Hamano
Merge bran
c
h 'fl/c
v
sserver'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C
Hamano
Update dra
f
t rel
e
ase notes
for 1
.
5
.
2 w
i
th accumu
l
ated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
S
t
art preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branc
h
'master' of git://repo
.
or
.
c
z/git-gu
i
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
M
er
g
e
branch '
m
aint' of git://rep
o
.
o
r
.
c
z
/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
M
e
rge branch 'jc/re
a
d-t
r
ee-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
am
a
n
o
A
d
d
a demons
t
ration/test of
cus
t
omized
m
erge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
All
o
w specif
y
i
ng specialized
m
erge-backend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
gi
t
-gu
i
:
Honor T
C
LTK_PATH if
supp
l
ied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-r
e
cursive
:
sep
a
r
ate out xdl_merge
(
) interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow
more tha
n
true/false
to
attrib
u
tes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o C
H
am
a
no
Make s
u
re q
u
i
c
kfet
c
h
is not
fooled with
a
previou
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge br
a
nch
'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C H
a
mano
send-email: do not
l
e
ave a
n
empty CC: line if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
M
erge bra
n
c
h 'm
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Haman
o
Change attribute negation marker from
'
!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hama
n
o
Define
a
built-in attribute macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribu
t
e macro supp
o
rt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
a
n
o
Makefi
l
e: a
d
d
pat
c
h-ids
.
h
bac
k
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
F
ix
'd
i
ff' att
r
ibute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
F
ix 'crlf' attrib
u
te s
e
mantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C
H
ama
n
o
Merge gi
t
://git2
.
k
ernel
.
or
g
/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C
H
ama
n
o
Teach 'd
i
ff'
about 'diff'
a
ttrib
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C H
a
mano
Def
i
ne 'crlf'
attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add basic
i
nfra
s
truc
t
ure t
o
a
s
sign attr
i
b
utes
t
o p
a
ths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Replace a pair of pa
t
che
s
with
u
pdated o
n
es for subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
ama
n
o
Do not default to --no-index
w
hen
g
iven two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ham
a
no
M
e
rge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
a
man
o
Fix
g
it {log,
s
how,
.
.
.
}
-
-pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
D
ocumentation: --ch
e
rr
y
-
p
ick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log --
c
herry-pi
c
k A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
Refactor patch-id filterin
g
out of git-
c
herry and g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Add
%m to '--prett
y
=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hama
n
o
Merge
bran
c
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hama
n
o
GI
T
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fsck: do not compla
i
n on
d
etac
h
ed H
E
AD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
Merge
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
g
it-fetc
h
: use fetch--
t
ool pick-rref to avoid local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
gi
t
-fetch--tool pick-r
r
ef
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t3030
:
merg
e
-recu
r
sive backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
mer
g
e-recurs
i
v
e: hand
l
e D/
F
conflict case more carefu
l
ly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
merge-recurs
i
v
e
:
do not ba
r
f on
"
to be removed" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
Treat D/F conflict entry more care
f
ully
i
n unpac
k
-tr
e
es
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ham
a
no
t
1
000: fix case
t
a
ble
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
s
h
ortl
o
g
-
w: m
a
ke wrap-
l
i
n
e behaviour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Merge br
a
nch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Me
r
ge branch 'jc/merge-s
u
btree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C H
a
man
o
Merge b
r
anch 'j
s
/fetch-pr
o
gress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
i
o
C Hamano
Add
D
ocumentation/cmd-list
.
mad
e
t
o
.
gi
t
i
gnore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
uni
o
C Ham
a
no
Start 1
.
5
.
2 cycle
b
y pre
p
areing RelNotes
f
or it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge
branch
'j
c
/read-tree-df' (early p
a
rt)
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C
Ha
m
ano
Mer
g
e
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Ha
m
ano
P
r
epare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
A n
e
w
m
erge stragety 'su
b
tree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push to multiple lo
c
ations
d
oes not stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
git-
p
ush r
e
p
o
rts the U
R
L after fa
i
ling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge branch
'jc/inde
x
-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
amano
Merge branch '
f
p/make-j'
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C H
a
mano
M
e
rge branc
h
'cc/bise
c
t'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ha
m
ano
Merge
branch 'jc/checkout'
(
early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch
'maint
'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
H
a
man
o
D
ocumentatio
n
: tighten depen
d
e
ncy for git
.
{ht
m
l,
t
xt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
man
o
gi
t
-bisec
t
: allow bisecting with only o
n
e
b
a
d commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
t603
0
: add a bit mo
r
e
tests to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-bisect: moderni
z
ati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next