repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
add test case for recursive merge
2006-12-13
Junio C Hamano
a
d
d
test case for recursive me
r
ge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C H
a
mano
sh
o
rtlo
g
:
f
ix
se
g
fau
l
t on e
m
pty authorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Ju
n
io C
H
amano
sh
o
rtlog: remo
v
e "[PATCH]" prefix from
s
hortlog output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-08
Junio
C
Hamano
F
ix perl/ buil
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio
C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
amano
git-merge
:
f
i
x "fix
c
o
nfusion between tag
a
nd
b
ranch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-me
r
ge: squelch needless erro
r
m
essage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hama
n
o
Merge
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C
Ham
a
n
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-06
J
u
n
i
o C Ham
a
no
git-reset to rem
o
ve "$GI
T
_DIR/ME
R
GE_MSG
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Ju
n
io C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2006-12-04
J
u
nio C Hamano
unpack-trees: m
a
ke sure "df_conflict_
e
ntry
.
name" is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
rec
e
iv
e
-pac
k
: do not
i
nsist on fast-for
w
ar
d
outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Ju
n
io
C Hamano
Merge branc
h
'
m
a
in
t
'
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
g
i
t-merge: fix conf
u
sion between
t
ag and
b
ranch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Ha
m
ano
M
e
rge maste
r
.
kernel
.
or
g
:/
p
ub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
ama
n
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
J
unio C Hamano
tutorial: t
a
lk about user
.
name
e
arly
and don't start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C Hama
n
o
Merge branch 'jc/gl
o
bfetch'
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C H
a
m
a
n
o
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
i
o
C
Hamano
git b
l
ame
-
C: fix output format tw
e
aks
w
h
e
n cro
s
s
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
cvsimport: s
t
yle fixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
i
o C
H
amano
M
e
rge branch
'
js/
s
hortlog'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge b
r
anch 'jc/p
u
sh-delet
e
-ref'
commit
|
commitdiff
|
tree
2006-11-27
Junio
C H
a
mano
Merge
branch 'jc/
m
erge'
commit
|
commitdiff
|
tree
2006-11-27
J
u
n
i
o C Hama
n
o
g
it-me
r
ge: do not leak rev
-
p
ars
e
outp
u
t used for checkin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio C Hamano
g
i
t
-
m
e
r
ge: tighten e
r
ror c
h
ecking
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
i
o C Ham
a
no
Mer
g
e br
a
nch
'
jc/pack-peel
e
d
'
commit
|
commitdiff
|
tree
2006-11-26
Junio
C
H
a
m
a
n
o
grep: do not skip unme
r
ged entrie
s
w
h
en
grepping in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
J
u
ni
o
C
H
amano
Merge branch 'jn/web'
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
f
e
tch-pack:
do not barf
whe
n
duplicate r
e
patterns
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-fe
t
ch: allow
f
orcing
g
l
ob pattern in refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C
H
ama
n
o
M
erge
b
ranch 'master' into j
c
/g
l
o
b
fe
t
ch
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-
f
etch: exit
w
ith
n
on-zero status
w
hen fast-forwa
r
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C Hamano
g
i
t-shortlog: make
common repo
s
itory prefix
config
u
rable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ha
m
ano
git-shor
t
l
o
g
:
f
i
x com
m
on repos
i
tory prefix ab
b
reviation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
Hamano
git-branch -D: make it
work
even
when on a ye
t
-to-be
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
unio C Ha
m
ano
git
-
clone: st
o
p d
u
mb
protocol f
r
om c
o
pying
refs
o
u
tside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
gitweb: (sty
l
e) u
s
e
chomp without pa
r
enthe
s
es c
o
nsis
t
ently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Allow g
i
t push to delete r
e
m
o
t
e ref
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C
H
a
mano
Merge branch 'jn
/
we
b
'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
H
a
m
ano
M
e
rge branc
h
'pb/diffroot'
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
io C Hamano
Merge bran
c
h
'
jc/p
a
ck-heuristics'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
Hamano
Merge branch 'jc/nu
m
s
ta
t
'
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
io
C Hamano
Merge branch
'ap/b
r
an
c
h-ref-disp
l
a
y
'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge br
a
nch 'ap/prune'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
Hamano
Type
f
ix
b
uiltin-prune
.
c::prune_object()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
J
u
n
i
o C Hamano
Merg
e
branch 'jc/upl
o
ad-pack'
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o
C
H
am
a
no
refs outsi
d
e
r
efs/{heads,tags}
m
atch less strongly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C Hamano
git-fetch
:
allow glob p
a
ttern in re
f
spec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C H
a
mano
gi
t
-
fetch: fix dumb
p
rotocol
trans
p
ort t
o
fetch from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ham
a
no
git-fetch: re
u
se ls-remo
t
e result
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
J
u
nio
C
Haman
o
GIT
1
.
4
.
4
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
Junio C Ha
m
a
no
t
r
us
t
-e
x
ecutable-bi
t
: f
i
x
b
reaka
g
e for
s
ymli
n
ks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Junio C Hama
n
o
Store
p
eeled re
f
s in packed-refs
(
take 2)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Junio C Haman
o
merge:
a
llow merging into a yet-to-be-b
o
rn br
a
n
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Junio C Hamano
g
i
t-merge: make it usable as the firs
t
class UI
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Junio C H
a
m
ano
remove merge-recursi
v
e-o
l
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-20
J
unio C H
a
man
o
Store peeled refs in pa
c
k
ed
-
refs file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-20
Junio C Hamano
d
o
_
f
or_
e
ach_ref: perform the
same sanity check for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-20
Junio C H
a
mano
g
i
t
-
fetch: follow lig
h
tweit tags as w
e
ll
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-17
Junio C Hamano
pack-objects: tweak "do not
even att
e
mpt delta" heuris
t
ics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
Jun
i
o C
H
a
m
a
no
convert-obj
e
c
t
s
: set _XOPEN_SOU
R
C
E to 600
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
Junio C Hamano
git-
c
heckout:
a
l
low path
s
pec to rec
o
ver l
o
st w
o
rking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
Junio C
H
amano
git-c
h
ecko
u
t: do
no
t
a
l
low -f and -m
a
t
t
he same time
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
Ju
n
io C
Hamano
a
p
p
ly -
-
n
umstat: mark
b
in
a
ry dif
f
stat with - -, n
o
t 0 0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
Junio C Hamano
GIT 1
.
4
.
4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-13
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-12
Junio C Ham
a
no
GIT 1
.
4
.
4-
r
c2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-12
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-12
Junio C Haman
o
g
it-cvsserver:
read from git with
-z to get non-ASCII
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-11
J
unio C Haman
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-11-11
Junio
C Hamano
path-list: fix path-list-insert return
v
a
lu
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-10
J
u
nio
C
Haman
o
git
-
annotat
e
: fix -S on
graft
f
ile wit
h
c
omments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-10
J
unio C Hamano
gi
t
-annotat
e
:
no nee
d
to exec
b
lame; it is
b
uilt
-
in
.
.
.
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
Documen
t
ati
o
n: mo
v
e b
l
ame examples
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-11-09
Ju
n
io C Hamano
g
i
tweb: fix unmatche
d
div i
n
c
o
mmit
d
iff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-09
Junio C Haman
o
gitweb
:
protect commit messages from cont
r
ol
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
g
itweb: protect blob and
d
i
ff output
line
s
from controls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-09
Jun
i
o C Hamano
git
-
pic
k
axe: retire pickaxe
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Junio C
H
a
m
a
no
Merge git://git
.
ke
r
nel
.
org/pub/s
c
m/g
i
tk
/
gitk
commit
|
commitdiff
|
tree
2006-11-08
Ju
n
io C Hamano
gi
t
-status: quo
t
e
LF i
n
its outpu
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
J
u
nio
C
H
amano
g
itweb: do not gi
v
e blame li
n
k unconditio
n
ally in diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Ju
n
io C Haman
o
gitweb:
minimally fix
"
fork"
s
uppo
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hamano
gitweb: fix disabl
i
n
g
of "forks"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hamano
GIT
1
.
4
.
3-rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Junio C H
a
mano
Merg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hama
n
o
Merge
b
ra
n
ch '
j
c/pickaxe
'
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hamano
git-pickax
e
:
a
llow "
-
L
<something>,+N"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-07
Ju
n
io C Hamano
Merge
b
r
an
c
h 'jc/re
a
d-tree
'
commit
|
commitdiff
|
tree
2006-11-07
Ju
n
i
o
C
H
a
mano
Merge b
r
anc
h
'np/index-pack'
commit
|
commitdiff
|
tree
2006-11-07
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-07
Junio C Hamano
gi
t
-pic
k
a
x
e: -L /regexp/,/regexp/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-06
J
u
nio C Hamano
Document g
i
t-pack-
r
efs
and
l
ink it to git(
7
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-06
Junio C Ham
a
n
o
adjust_
s
hared_
p
erm:
c
hmod() only w
h
en needed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-05
Junio C
Hamano
git-pickaxe:
optimize by avoiding r
e
peated re
a
d
_
sh
a
1
_
fi
l
e()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-05
Junio C
H
amano
git-b
l
ame:
add inte
r
n
a
l
statistics to count read b
l
obs
.
commit
|
commitdiff
|
tree
next