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
Merge branch 'jc/attr'
2007-04-22
J
unio
C Hamano
M
erge
b
ranch 'j
c
/
a
t
tr'
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
io C Hama
n
o
Merge
bra
n
c
h
'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
b
r
anc
h
'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge branch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
m
a
no
Merge branch 'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-21
J
u
ni
o
C
Hamano
GI
T
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Hamano
loc
k
file: r
e
cord
t
he pr
i
mary p
r
oc
e
ss
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io
C
Hamano
c
o
nvert
.
c: restr
u
cture the att
r
i
bu
t
e
c
h
ecking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hama
n
o
Fix bogus
l
inked-li
s
t
manageme
n
t f
o
r user
d
efi
n
ed mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
git-clon
e
: f
i
x
dumb protocol
t
r
a
nsport to
clone from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
n
i
o C Hamano
Merge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
Document gitat
t
ri
b
utes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C H
a
mano
Up
d
ate
'
crlf' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio
C
H
aman
o
Document
a
tion: suppo
r
t manua
l
s
e
ction (5)
-
file fo
r
mats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Juni
o
C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simpl
i
fy code t
o
find recursive merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hama
n
o
Counto-fix in merge-r
e
cu
r
siv
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
H
amano
Mer
g
e
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ha
m
ano
F
i
x funny types used i
n
at
t
ri
b
ute value
r
epresentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
a
n
o
A
l
l
ow
low
-
level driver
to specif
y
different
behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Custom low-level m
e
rge driver: change the configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Allow th
e
default low-level m
e
r
ge dri
v
e
r to be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Custom low-
l
evel merge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C
H
a
mano
Merge
branch 'fl/
c
v
s
s
e
rver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
M
e
rge bra
n
c
h
'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Ham
a
no
Update draft release notes for 1
.
5
.
2 wit
h
accumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
M
e
rge branch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
ni
o
C Hamano
Start preparing
f
or 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Haman
o
Merge
b
ranch 'master' o
f
git://repo
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
e
rge branch 'maint'
of git://repo
.
o
r
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
Merge branch
'jc/rea
d
-tre
e
-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
mano
Add
a de
m
onstration/test of customized me
r
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allo
w
specifying
s
pecialized mer
g
e-backend per pat
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
git-g
u
i
:
Honor T
C
LTK_PATH if sup
p
l
i
ed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
un
i
o C Hama
n
o
merge-r
e
cursive:
separate ou
t
xdl_m
e
rge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C
Hamano
Allow more than true/false to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
M
a
ke sure quic
k
fe
t
ch
i
s not
fooled with a pre
v
ious
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C H
a
mano
Merge branch
'
js
/
wra
p
-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hama
n
o
s
e
nd-
e
m
a
i
l
: do not leave an
empty CC: lin
e
i
f no c
c
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
u
n
io C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branc
h
'm
a
int
'
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C
Hamano
Cha
n
ge attribut
e
negation
m
arker from '!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Define a built-in a
t
tribute macr
o
"
b
inary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
attrib
u
te macro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
M
akef
i
le: add patch
-
ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Fix 'diff' attribute s
e
m
a
ntics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
Fix 'crlf' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
M
erge git://git2
.
ke
r
nel
.
o
r
g/pub/sc
m
/git
k
/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
m
a
no
Teach 'di
f
f' about '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
Ju
n
io C
H
a
mano
Add basic inf
r
a
structure to
a
ssign
a
ttributes to
paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
M
e
r
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
aman
o
Replace
a
p
air of pa
t
ches with updated on
e
s
f
or subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hama
n
o
Do not de
f
ault
to --no-
i
ndex
whe
n
given two di
r
ectories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
Mer
g
e branch
'
jc/
c
he
r
ry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Haman
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
Ha
m
an
o
Fix git {log,s
h
ow,
.
.
.
} --
p
retty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
D
ocument
a
t
ion: --ch
e
rry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
git-log --che
r
r
y
-
p
ic
k
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
R
efactor p
a
tch-id filteri
n
g out of
gi
t
-cher
r
y and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
Hamano
Add %m
t
o '--pretty=for
m
at:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
M
e
rge b
r
anch
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
G
IT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fsc
k
: do
n
ot complain on detach
e
d HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-fetch
:
use fetch--tool pi
c
k-r
r
e
f to avoi
d
local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
Hamano
git-fetch--tool pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C
Hamano
t3030:
mer
g
e-
r
ecursive backend tes
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
uni
o
C Hamano
merge-re
c
ursive: handl
e
D/F co
n
f
l
i
c
t
c
a
se mor
e
carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
merge-recursive: do n
o
t barf on "to be removed" entr
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C
H
amano
Tre
a
t D/F conflict
e
ntry mo
r
e
c
arefu
l
l
y
in unp
a
ck-
t
rees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
t1
0
00:
fix case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
sh
o
rtlog -w: make
wr
a
p-line behaviour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merg
e
br
a
nch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
un
i
o
C
H
a
man
o
Merge
bra
n
ch
'
jc/mer
g
e-subtre
e
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Haman
o
Merg
e
branch 'js/fetch-prog
r
ess'
commit
|
commitdiff
|
tree
2007-04-09
J
u
ni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Document
a
tion/cmd-lis
t
.
made to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
S
t
art 1
.
5
.
2
c
yc
l
e
b
y
prep
a
reing RelNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hamano
M
erg
e
bran
c
h
'
jc/re
a
d
-
tree-
d
f
' (early
part
)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
Prepare fo
r
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o C Hamano
A new merge st
r
ag
e
ty 'subtr
e
e'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git
-
p
ush to
multiple
l
ocati
o
ns does n
o
t
s
t
op a
t
th
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
g
i
t-push
reports
the URL after fai
l
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'jc/index-
o
utput'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge bran
c
h 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Haman
o
Merge branc
h
'cc/b
i
sect
'
commit
|
commitdiff
|
tree
2007-04-07
J
u
ni
o
C H
a
mano
Merge
branch
'jc/checkout
'
(early
par
t
)
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hama
n
o
M
e
rge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Do
c
umentatio
n
:
t
i
ghten depend
e
n
cy
fo
r
git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
Hamano
git-b
i
sect: allo
w
bisectin
g
w
i
th only one bad commi
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
it more tests to gi
t
-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C
H
a
mano
git-bisec
t
:
mod
e
rniz
a
tio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Haman
o
M
erge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
m
a
no
Rename a
d
d_fi
l
e_to
_
index() to add_file_
t
o_cache(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Rename st
a
ti
c
variab
l
e w
r
ite_index to upd
a
te_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename internal
fu
n
ction "add_file_to_cache" in
b
uilti
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C H
a
m
ano
P
ropagate cache e
r
ror
inte
r
nal to
r
efresh_cache()
v
i
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next