repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'master' of git://repo.or.cz/git/fastimport
2007-04-25
Junio C Hamano
Merge b
r
anch '
m
aster' of git://r
e
po
.
or
.
c
z/git/fastim
p
ort
commit
|
commitdiff
|
tree
2007-04-24
Junio C
H
amano
gitattribut
e
s docum
e
ntation: clari
f
y
ove
r
riding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C H
a
m
ano
t/te
s
t-l
i
b
.
s
h
: Protect ourselves fro
m
comm
o
n
misconfiguration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio
C Ha
m
a
no
Build RPM wi
t
h E
T
C_G
I
TCONFIG=/etc/gitconfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t6030: grab co
m
m
it object name as we
go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t5302: avoid using ta
i
l
-
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C H
a
mano
Document "
d
iff=dri
v
er" attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Suppo
r
t 'dif
f
=
pgm'
attribut
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Hamano
pack-objects:
m
a
ke g
e
nerated pack
f
il
e
r
e
ad
-
only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Update tests
not
t
o
a
ssum
e
th
a
t generated packfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fix 'quickf
i
x'
on pack-obj
e
cts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Ha
m
ano
pack-objects: quickfix for per
m
is
s
i
o
n
m
odes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Upda
t
e
draft r
e
l
e
ase no
t
e
s
f
o
r v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Ha
m
ano
Documentation/Make
f
ile:
f
ix section (5) instal
l
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
U
pdate documentation links to p
o
int at v
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
branch 'lt/objall
o
c'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
Merge branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
erge branch 'lt
/
g
itlink'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
Hamano
Merg
e
branch
'np/pa
c
k'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
m
a
n
o
Merge bra
n
ch 'jp/refs
'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C
H
ama
n
o
Merge b
r
a
nch
'
jc/quic
k
f
e
t
ch'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hama
n
o
Mer
g
e b
r
anch
'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
i
o C
H
a
mano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
l
ockfi
l
e: rec
o
rd
the
p
r
i
m
a
ry process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
ano
conver
t
.
c: restru
c
t
u
re the attrib
u
te chec
k
ing part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Hamano
F
i
x bogus l
i
nked-lis
t
mana
g
emen
t
f
o
r
u
ser defin
e
d merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
n
io C H
a
mano
git-clone: fix d
u
mb protoc
o
l tr
a
n
s
port to
clone fr
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C H
a
ma
n
o
git-add -u:
m
atch the index
with w
o
r
king tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
an
o
Docu
m
ent gitattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io
C
Hamano
Update 'crlf' attribute sema
n
ti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
Documentat
i
on: support m
a
n
ual section (5) - file for
m
ats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Juni
o
C Ha
m
ano
Merg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-19
Junio C
Hamano
Simplify
c
o
d
e
t
o
f
i
nd
r
ecursive merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C Hamano
C
ounto
-
f
ix in merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
a
m
ano
Fix funny
t
ypes used
in att
r
ibute value repres
e
ntati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
ano
A
llow low-level
dr
i
ver to
speci
f
y di
f
ferent behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Cus
t
o
m
l
o
w
-
lev
e
l m
e
rge driv
e
r:
change th
e
confi
g
uration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C H
a
mano
Allow the
default
l
ow-level mer
g
e driver to be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C Hamano
Custom lo
w
-
l
e
vel m
e
rge dri
v
er sup
p
or
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch '
f
l/
c
v
s
s
erver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
U
pdat
e
draft release n
o
tes f
o
r 1
.
5
.
2
wi
t
h
a
cc
u
mulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Start prep
a
ring f
o
r
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
H
amano
Merge
b
r
anch 'master' of git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Mer
g
e b
r
anch 'maint' of
g
it
:
//repo
.
or
.
c
z/git-
g
u
i i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Mer
g
e branch 'jc/r
e
ad-t
r
e
e
-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
Add a demonstration/test o
f
customized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Haman
o
Allow specifyin
g
sp
e
cialized m
e
r
ge-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio
C Hamano
git-gui: Honor TCLTK_PATH
if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
H
amano
merge-re
c
ursive: s
e
p
a
rate
out xdl_merge()
interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
Allow
m
o
re th
a
n true/false to att
r
ibutes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
Make sure qu
i
ckfetch is not fooled with a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Mer
g
e branch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hama
n
o
send-ema
i
l
: do not lea
v
e
an
e
mpty CC: li
n
e if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C
Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Change attribute nega
t
ion mar
k
er
f
rom '!' to '-
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Define a buil
t
-in attribute macro "
b
inary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
at
t
ribu
t
e macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
aman
o
M
akefi
l
e: ad
d
patch-ids
.
h
back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'diff' a
t
tribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hama
n
o
Fix 'crlf'
attribute sem
a
ntics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C
H
a
mano
Merg
e
g
i
t://git2
.
ke
r
nel
.
org/pub/scm/gi
t
k/gitk in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Haman
o
Teach 'diff' ab
o
u
t
'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Defi
n
e 'c
r
lf'
attr
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Add basic infrastruc
t
ure to assign attributes to pat
h
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
m
ano
Merge branch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Replace a pair of
patches with upd
a
ted ones for sub
p
rojec
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do not default to --no-index
w
hen
given
two di
r
e
c
to
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ham
a
n
o
Merg
e
bra
n
ch 'jc/che
r
r
y
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Haman
o
F
i
x
g
it
{
log,show,
.
.
.
} --pretty=emai
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documen
t
ation: --cherry-pi
c
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
git-
l
o
g
-
-
c
herry-p
i
ck A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
R
e
f
actor patch-id fi
l
ter
i
ng out
of git-ch
e
rr
y
an
d
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
A
d
d
%m to '--pretty=format
:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
i
o
C
Ham
a
no
G
I
T 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
J
u
nio C
Hamano
fsck:
d
o
n
ot complain on deta
c
h
e
d HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
git-fetch: use fetch--tool
pick-rref to avoid local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Ham
a
no
gi
t
-fetch-
-
tool pic
k
-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
t3030: merge-
r
ecursive backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
m
e
rge-recursi
v
e: handle D/F conflict case m
o
re
c
aref
u
lly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
merge-re
c
urs
i
ve: do not barf on "to be removed" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
i
o
C Ham
a
n
o
T
r
e
at D/F confli
c
t
e
n
try mo
r
e c
a
refully
i
n
u
npack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t
1
000: fix case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
ma
n
o
shortlo
g
-w
:
make
wrap-line behavi
o
ur
o
ptional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C
H
amano
Merge b
r
a
nch 'jc/
p
ush'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
Merge bra
n
ch 'jc/merge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge
branch 'js/fetch-progr
e
ss'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io
C
H
a
m
a
no
Merge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C
H
am
a
no
Ad
d
Documentat
i
on
/
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
rt 1
.
5
.
2 cyc
l
e b
y
prep
a
rein
g
RelNotes
for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio
C Hamano
Merge
branch 'j
c
/
re
a
d
-tre
e
-
df'
(
early part)
commit
|
commitdiff
|
tree
next