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
git-cvsserver: exit with 1 upon "I HATE YOU"
2007-04-22
J
unio C H
a
m
ano
Fix 'quickfix' on
p
ack-obj
e
cts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
pack-
o
bjects:
quic
k
fix
f
or
permissi
o
n mo
d
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C
Hamano
Update draft release no
t
es for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Ham
a
no
Documentation/Make
f
ile: f
i
x section
(
5)
installation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Updat
e
documentat
i
on links to
point at v
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
mano
M
e
r
ge bran
c
h 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
J
un
i
o C Hamano
Merge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Haman
o
Merge b
r
anch 'jc/
a
t
t
r'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
bra
n
ch 'lt/
g
itlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
ama
n
o
Merge
b
ran
c
h 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
Merge branch
'
jp/re
f
s'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hama
n
o
Merg
e
branch 'j
c
/quickfetc
h
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge br
a
nc
h
'
maint
'
commit
|
commitdiff
|
tree
2007-04-21
J
u
n
i
o
C
H
amano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C H
a
m
a
no
lo
c
kfile: recor
d
t
h
e pr
i
mary proce
s
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
convert
.
c: restructure
the
attrib
u
te ch
e
c
k
ing part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
Hamano
Fix bogu
s
linked-
l
ist managemen
t
for us
e
r defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Haman
o
git-c
l
o
n
e:
fix dumb pr
o
tocol
t
rans
p
o
r
t to clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
gi
t
-
a
dd -u: ma
t
ch the index wi
t
h w
o
rking tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
M
erg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
J
un
i
o
C
Ha
m
ano
Document g
i
tattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
Update 'crlf' attribute
s
ema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Ha
m
a
n
o
D
ocumen
t
ation: suppo
r
t
m
anu
a
l sectio
n
(5) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Merge branch '
m
a
int'
commit
|
commitdiff
|
tree
2007-04-19
Junio C
H
a
mano
Simplify code to fi
n
d
recursive merge dri
v
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
uni
o
C Ha
m
ano
C
ou
n
t
o
-fix in mer
g
e-recursi
v
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix funny typ
e
s used
i
n attribu
t
e va
l
ue representa
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Allow lo
w
-level driver to s
p
ecify dif
f
erent beh
a
v
io
u
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C
Hamano
Custom low-level merge driver
:
change the configu
r
ation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
All
o
w the default low-level merge
d
river
t
o
be configu
r
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Ha
m
ano
Custom low-level
m
er
g
e driver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Merg
e
bran
c
h 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
a
no
Update dra
f
t release notes for 1
.
5
.
2 wi
t
h accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Start pr
e
paring for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Haman
o
Me
r
ge b
r
anch 'maste
r
'
o
f git://
r
epo
.
o
r
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Merge branch 'maint' of git://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
amano
Mer
g
e branch '
j
c/read-t
r
ee-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a de
m
onstration/test o
f
customized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
l
lo
w
specifying special
i
z
e
d
merge-backend per
path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
m
a
no
git-gui: Ho
n
or TCL
T
K
_
PATH
i
f supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge
-
recursive: separate out xd
l
_m
e
r
ge
(
) interf
a
ce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
m
ano
Allow more th
a
n true/f
a
l
se to attrib
u
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Make sure quic
k
fetch is
not fooled with a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io C Hamano
Mer
g
e
bran
c
h
'js
/
wrap-l
o
g'
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io C Hamano
send-
e
m
ail
:
do not le
a
ve an
e
m
pt
y
C
C:
li
n
e
i
f
no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Hamano
Me
r
ge
b
ran
c
h
'maint
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C H
a
man
o
Change
attribute negation m
a
rker from '
!
'
t
o '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C
Haman
o
Define a bu
i
lt
-
in att
r
ibu
t
e macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
a
m
a
no
attribute
ma
c
ro suppor
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Makefil
e
:
add patch
-
ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hama
n
o
Fix 'dif
f
'
a
ttribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
Fix 'cr
l
f' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Merge
git://
g
i
t
2
.
kernel
.
org/pub/s
c
m
/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'diff' about
'diff'
a
ttribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define 'crlf
'
attr
i
b
ut
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hamano
Add basic
i
nfrast
r
ucture to
a
ssign attr
i
b
u
tes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Ham
a
no
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
io
C Hamano
R
e
pl
a
ce a pair of patches wi
t
h updated ones fo
r
subpro
j
ect
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Ha
m
ano
D
o not
defa
u
l
t
to --
n
o-index when given two
directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
a
n
o
Merge branc
h
'
jc
/
c
h
erry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
a
mano
M
e
r
g
e bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Hamano
Fix git {l
o
g,show,
.
.
.
} --p
r
etty=
e
mail
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hama
n
o
Document
a
tion:
--che
r
r
y
-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
a
n
o
git-log --
c
h
e
r
ry-
p
ick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
Re
f
actor patch-id filtering
out of git-ch
e
rry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
Add %m to '--pre
t
ty=format
:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
GIT
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Jun
i
o C
Hamano
fsck
:
do not
c
omplai
n
o
n
det
a
ched HEA
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ham
a
n
o
M
e
rge
b
ranch '
m
ai
n
t
'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
g
i
t-fetch: use fet
c
h--
t
oo
l
pick-rref to avo
i
d local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
git-fetch--
t
ool pick-
r
ref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
io C
H
amano
t
3
0
30: merge-recursiv
e
backend t
e
st
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hama
n
o
merge-re
c
ur
s
ive
:
han
d
le
D
/
F
c
o
n
f
lict case more car
e
f
u
lly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ham
a
no
merg
e
-
r
ecursive:
d
o not barf
on
"
to be removed" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Ham
a
no
Treat
D
/F conflict entry more c
a
refully
i
n u
n
pac
k
-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
t1000: fix case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
shortlog -w: make wra
p
-
line behaviour op
t
ional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
i
o
C Hamano
M
erge branch 'jc
/
push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio
C Hamano
Merge
branch
'
jc/merge-
s
ubtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
M
erge
b
r
a
n
ch 'js/fe
t
ch-prog
r
ess'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Merge bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
Add Documentati
o
n/cmd-list
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
St
a
r
t 1
.
5
.
2 cycle
b
y preparei
n
g
R
e
lNotes f
o
r it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
i
o
C
Hamano
Merge b
r
anch 'jc/read-tre
e
-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Haman
o
Merge br
a
n
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
Prepare
f
or 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A ne
w
merge
stragety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C Hamano
git-push to
m
u
l
ti
p
l
e locations
does not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
git-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
H
a
m
a
n
o
M
e
rge branch 'jc
/
i
ndex-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge b
r
anch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge bran
c
h 'cc/
b
i
s
ect'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Merge branch 'j
c
/checkou
t
' (ea
r
ly part)
commit
|
commitdiff
|
tree
2007-04-07
Junio
C H
a
man
o
Merge bran
c
h 'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Documentation:
t
ighten de
p
en
d
ency f
o
r git
.
{h
t
ml,
t
xt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next