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
Ju
n
io C
Hamano
Update tests not to assume
t
hat generated packfi
l
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C
H
amano
Fix 'quickfix' on pack
-
object
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
pac
k
-obj
e
cts:
qu
i
ckfix for permissi
o
n modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
an
o
Update
dra
f
t release
n
o
t
e
s for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
no
Document
a
tion/Makefile: fix section (5) installation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C H
a
mano
Update do
c
umenta
t
ion links to p
o
i
nt at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C
H
amano
M
er
g
e branch 'lt/o
b
jalloc'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Merg
e
br
a
n
ch 'jc/
a
dd'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge bran
c
h '
l
t/gitlin
k
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
er
g
e bran
c
h 'np/pac
k
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Me
r
g
e
br
a
n
ch 'jp/ref
s
'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Ham
a
no
M
e
rge branch 'j
c
/
q
uickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
ano
G
IT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
loc
k
file: recor
d
the
prim
a
ry pro
c
es
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
convert
.
c: res
t
ructure the attribute checking
p
a
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Hamano
Fix bogus
l
i
n
k
ed-list
management for user defined
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
n
i
o C
Ham
a
no
g
it-clone: fix dum
b
protoc
o
l
t
ransp
o
rt to clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
git-
a
dd
-
u: m
a
tc
h
the index with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Ha
m
ano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C
H
a
mano
Document gita
t
tributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
H
a
mano
Update 'crl
f
'
attribute s
e
mantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Doc
u
mentat
i
on:
support ma
n
ual s
e
ction
(
5
)
-
fil
e
formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio
C
H
a
m
a
no
Sim
p
lify code to
f
i
nd recursive me
r
ge d
r
iver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Ham
a
no
Counto
-
fix in me
r
ge-recu
r
sive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
M
e
r
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Fix f
u
nny types
u
s
e
d in
attribute
v
alu
e
r
e
pr
e
s
ent
a
ti
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C H
a
m
ano
Allow low-level
d
river
t
o
specify different
beha
v
iour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Custom low-l
e
vel
m
erge driver:
c
hange the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
A
l
low the default low-level merge driver to be c
o
nfig
u
red
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C
Hamano
Custom low-level
m
e
r
ge
driver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Merge branch 'f
l
/cvs
s
erver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
M
e
rg
e
bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Update draf
t
release no
t
es for 1
.
5
.
2
with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
M
e
rge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C
Hamano
Start preparing
f
o
r
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C Hamano
Merge b
r
anch 'maste
r
' of git://re
p
o
.
o
r
.
cz/git
-
g
u
i
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ham
a
no
Merge branch 'maint' of git:/
/
rep
o
.
or
.
c
z
/git-gui
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C
Hamano
Merge
b
ranch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
n
o
Add
a
demonstra
t
ion/te
s
t of customi
z
ed
m
er
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
Allow specifying s
p
eci
a
lized merg
e
-
b
a
ckend pe
r
path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C
H
amano
g
i
t-gui:
H
onor TCLTK_
P
ATH if
s
upp
l
ied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
merge-re
c
ursiv
e
:
s
epa
r
at
e
o
u
t
xd
l
_
m
erge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
Allo
w
m
o
re
than true/false to
a
ttribute
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o
C H
a
mano
Make
s
ur
e
quickfetch
is not
f
ooled
w
ith a
p
re
v
ious
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch
'
j
s/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
send-email: do n
o
t leave
a
n
empty CC: line if no c
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
C
h
ange attribu
t
e nega
t
ion
m
a
rker f
r
o
m
'!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
De
f
ine a built-in at
t
r
i
bute macro
"binary
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
attribu
t
e
macro su
p
p
o
rt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ha
m
ano
Makefile: add patc
h
-id
s
.
h
back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
un
i
o C Ham
a
no
Fix 'diff'
a
ttribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C
Hamano
Fix 'crlf' attr
i
but
e
s
e
mantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o
C Hamano
M
e
rge git:
/
/
git
2
.
kerne
l
.
org/pub/scm/gitk/gi
t
k into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
T
e
ach '
d
iff' about
'
diff' attrib
u
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
H
amano
Defin
e
'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Ad
d
basic infrastructure to ass
i
gn
a
t
tr
i
bute
s
to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o
C
H
amano
Replace a p
a
ir of pa
t
c
he
s
with upd
a
te
d
ones fo
r
s
u
bprojec
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Ham
a
n
o
Do n
o
t default to --
n
o-index
w
hen
given
t
wo directo
r
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
Me
r
ge
b
ranch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C H
a
mano
M
e
rge
branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hamano
Fix git {log,show,
.
.
.
} --pretty
=
email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
D
o
cum
e
n
t
atio
n
: --c
h
erry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log -
-
cherry-
p
ick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
Refactor patch-id filt
e
ring out of git-
c
he
r
r
y
and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '--pretty
=
fo
r
mat
:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C
H
a
m
a
no
Mer
g
e
branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C
Hama
n
o
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fs
c
k:
d
o n
o
t c
o
mplain o
n
detached
H
E
A
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
a
m
ano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
g
i
t
-
fetch: use fetch--t
o
o
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 Hama
n
o
git
-
fetch--tool pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
t3030:
m
e
rge-re
c
u
r
sive back
e
nd
tes
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ha
m
ano
merge-
r
ecursive: han
d
le D/F conflict ca
s
e
m
ore carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
merge-recursive: d
o
not barf o
n
"to be rem
o
v
ed
"
entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Ha
m
an
o
T
r
e
at D/
F
co
n
flict entry more
c
ar
e
ful
l
y in u
n
pack-
t
rees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Ham
a
no
t1
0
00: fix case tab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io
C Hamano
shortlog
-
w: make wr
a
p-li
n
e behaviou
r
optio
n
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio
C Ha
m
ano
Merge branch 'j
c
/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
H
a
mano
Merg
e
br
a
nch 'jc/merge-su
b
tree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Mer
g
e branch 'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Ha
m
a
no
Mer
g
e bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio
C
Hamano
Add
D
ocumen
t
ation/cmd-list
.
made to
.
gitig
n
ore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio
C Hamano
S
t
a
r
t 1
.
5
.
2
c
ycle
b
y prepareing RelNot
e
s fo
r
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Ham
a
no
Merge branc
h
'jc/read-t
r
ee-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge
b
ranch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
Prepare for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
H
amano
A
new
merge str
a
g
ety 'subt
r
ee'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hama
n
o
g
it-p
u
sh to multiple
loc
a
t
i
o
ns does not st
o
p
a
t the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
g
it-push re
p
o
rt
s
the URL
a
fter
failin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
branch 'jc/index-outpu
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'f
p
/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Ha
m
ano
Merge
b
ranch
'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Mer
g
e branch 'jc
/
ch
e
ckout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Ha
m
ano
Merge branch
'
ma
i
n
t'
commit
|
commitdiff
|
tree
next