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
GIT 1.5.2
2007-04-23
Junio C Ham
a
n
o
U
p
date tests not
to assume that gene
r
at
e
d
packfiles
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
i
o C H
a
mano
F
ix 'quic
k
fi
x
' on p
a
ck-objects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Haman
o
pack-o
b
jects
:
quickfix
for pe
r
mission mode
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C H
a
mano
Update d
r
af
t
r
e
lease
n
otes for v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Documentati
o
n/Mak
e
file:
f
i
x
section
(
5) installation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io
C
Haman
o
Updat
e
documentation links to
p
oint at v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Merge branch '
l
t/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C Ha
m
ano
Merge br
a
nch 'jc/ad
d
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
r
ge branch 'j
c
/attr'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Mer
g
e
br
a
nc
h
'lt
/
gitl
i
n
k'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
r
ge bra
n
ch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio
C
Hamano
Merge branch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Ham
a
no
Me
r
g
e bran
c
h 'jc/quick
f
e
tc
h
'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
G
IT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Hama
n
o
lockf
i
le: rec
o
rd the primary process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
conv
e
r
t
.
c: r
e
structure
the attribu
t
e checking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
Fix bogus li
n
ked-list m
a
n
a
gement for user def
i
ned merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Hamano
git-clone
:
f
ix dumb protocol tran
s
p
ort to
c
lo
n
e from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
git-add -u: match the index with wo
r
king t
r
ee
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
Mer
g
e b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ham
a
n
o
Doc
u
ment git
a
ttr
i
butes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
Update '
c
rlf' a
t
tr
i
bute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Do
c
u
men
t
ation
:
support ma
n
ual section
(
5
)
-
file form
a
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
mano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify code to fin
d
rec
u
rsive m
e
rge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o
C
Hama
n
o
Counto-f
i
x in merge-recursi
v
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C
Hamano
Mer
g
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix funny type
s
u
sed
in attribute value rep
r
esentati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow l
o
w
-
l
evel driver to
s
pecify diffe
r
ent
beha
v
iour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ham
a
no
C
u
sto
m
l
o
w-level mer
g
e driver:
c
hange the configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o C Hamano
A
l
low the default
l
ow
-
leve
l
mer
g
e
dr
i
ver
t
o
be confi
g
ured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Custo
m
low-level
m
erge d
r
iver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Me
r
ge b
r
an
c
h 'fl/cvsserver
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io
C Ham
a
no
Up
d
ate dr
a
ft rele
a
se notes f
o
r 1
.
5
.
2 with
a
ccumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
erge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
S
t
art preparing
for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
M
erge branc
h
'master' of git://repo
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
M
erge b
r
anch 'maint' of g
i
t://repo
.
or
.
cz
/
git-gui
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
i
o C H
a
mano
Merge b
r
anch 'jc/
r
ead-tree-
d
f'
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
Add a
demonstratio
n
/test of cu
s
tomized mer
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
a
n
o
Allow specifyi
n
g speciali
z
ed merge-b
a
c
k
end
p
er pa
t
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
git-gui: Honor TCLTK
_
PATH
i
f
s
upplie
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-recursive: separate out xdl_merge(
)
interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
Allow more th
a
n tr
u
e/false to attribut
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Make sure
q
uickfetch is
not fo
o
l
ed with a previo
u
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o
C Hama
n
o
Merge branc
h
'js/wrap-l
o
g'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
send-
e
mail: do not leave a
n
empty CC:
li
n
e if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
u
n
io C H
a
man
o
Merge
bra
n
ch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C H
a
mano
Merge
branch
'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Ch
a
ng
e
at
t
rib
u
te negation marker from '!
'
t
o
'-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
Defi
n
e
a
built-in
a
ttribute m
a
cro "binary
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
at
t
rib
u
t
e
macro supp
o
rt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Make
f
i
le: add
p
atch-
i
ds
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Ham
a
no
F
i
x 'diff' at
t
ribute
s
e
m
antics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
Fix '
c
r
l
f
'
a
ttr
i
b
ut
e
semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C
Hamano
Merge
g
it://git
2
.
kernel
.
org/p
u
b/scm/gitk/gitk i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
an
o
Teach '
d
i
f
f' about 'di
f
f' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C H
a
mano
Define 'crlf' attri
b
ute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hama
n
o
Add basi
c
infras
t
ru
c
tur
e
t
o
assi
g
n a
t
tribut
e
s
t
o path
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hama
n
o
Mer
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Haman
o
R
eplace a
pair
of
p
a
tches w
i
th upda
t
ed ones
f
o
r subp
r
oject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Do not de
f
a
ult to --no-index when
g
iven
t
wo
d
i
r
ectories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C Hamano
Merge b
r
anch 'jc/che
r
r
y
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
a
ma
n
o
Merge b
r
anch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix
git {log
,
show,
.
.
.
} -
-
p
retty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
Documentation
:
--ch
e
r
r
y-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
gi
t
-log --
c
h
erry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C Hamano
R
e
fa
c
to
r
p
a
tch-i
d
fil
t
er
i
ng out of git-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
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
Merg
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
G
I
T
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Ju
n
io
C
Hamano
fsck: do no
t
compl
a
in o
n
d
e
tached H
E
AD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C
Haman
o
git-
f
etch:
u
se fe
t
ch--tool pick-r
r
e
f
to avoid loca
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
git-fet
c
h--too
l
pick-rre
f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
t3030: merge-r
e
cursive bac
k
end test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
merge-recu
r
s
i
ve: handle D/F conflict c
a
se
m
ore
c
aref
u
lly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
ni
o
C
H
a
m
ano
merge-r
e
c
ur
s
ive:
do no
t
b
arf on "to
b
e re
m
o
ved" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Tr
e
at D/F
c
o
nflict
ent
r
y more care
f
u
lly
in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
m
ano
t1
0
00: fix ca
s
e tab
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
s
h
o
r
tlog -
w
:
m
a
ke wrap-line behaviour option
a
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Me
r
ge b
r
anc
h
'jc
/
p
ush'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Merge branch 'jc/merge-subtree
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Mer
g
e branch 'js/fetch-
p
rogress'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C H
a
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hamano
A
d
d Docum
e
ntatio
n
/cmd-lis
t
.
made to
.
gitigno
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Ham
a
no
S
t
art 1
.
5
.
2
c
ycl
e
by prepar
e
i
n
g Rel
N
otes fo
r
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Haman
o
Merge branch 'j
c
/
read-tree-df'
(
early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
ma
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
Prepare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
ni
o
C Ha
m
ano
A
new merge stragety
'
s
ubtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Ham
a
no
git-push to m
u
lti
p
le
l
o
c
ations does not stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
git
-
push reports the URL after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merge b
r
anch 'jc/i
n
dex-out
p
ut'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Merge
branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C
Hamano
M
e
rge br
a
nch 'cc/bise
c
t'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
amano
Mer
g
e bran
c
h
'
jc/checkout' (earl
y
part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
next