repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/test-clone' into jc/clone
2006-12-19
Junio C
H
a
mano
Merge
branc
h
'jc/
t
est-
c
lone' int
o
jc/clone
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio C Hamano
R
evert "
f
ix
t
estsuite: make sur
e
they
u
se templates
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Junio
C
H
amano
fix testsuite: make s
u
re they
u
se templat
e
s
f
re
s
h
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio
C
Hama
n
o
rer
e
re: fix breaka
g
e of resolvin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
n
i
o C
H
am
a
n
o
ra
c
y-git: documentation u
p
dates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
show-r
e
f: fix --ex
c
lud
e
-existing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Hamano
parse-remote::expand_refs_wildcard()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
a
m
ano
show-ref: fix --verify --hash=length
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C
Ha
m
ano
show-ref: fix --quiet
--verif
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ham
a
n
o
M
e
r
ge branch 'jc/b
l
ame-
b
ound
a
ry'
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
Me
r
ge b
r
anc
h
'jc/reflog'
(
early part)
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Ha
m
an
o
Merge
b
r
an
c
h 'js/branch-con
f
ig'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ha
m
ano
Merge branch
'
jn/web' (early part)
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
ama
n
o
a
v
o
id a
c
cessin
g
_all
_
loose refs in git-show-r
e
f
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
H
amano
gi
t
-fet
c
h: Avoid re
a
din
g
pack
e
d refs
o
ver and over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C
H
amano
T
each sh
o
w-
b
ranch how to
show ref-log data
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
markup
fix in svnimport
d
ocume
n
ta
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fix mis-mark-up in git-merge-file
.
txt documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Jun
i
o
C Hamano
Fix ch
e
ck_file_director
y
_c
o
nfl
i
c
t
()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
gi
t
-add: remove
c
onflicting
entry whe
n
adding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
update-index: make
D
/F co
n
flict
e
r
ror
a bit
more verbose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C
H
amano
git-cl
o
ne:
l
ose t
h
e traditional '
n
o
-
separate-remote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C H
a
m
ano
git-clone:
lose the art
i
fic
i
al
"f
i
rst
"
fetc
h
r
efs
p
ec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-pull
:
refuse d
e
f
a
u
lt
merge
withou
t
b
ranch
.
*
.
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C Haman
o
git-clone: use
wil
d
car
d
specificat
i
on fo
r
tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
unio
C
Hamano
merge: give
a bit pre
t
tie
r
merge mes
s
age to
"
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Juni
o
C Ha
m
ano
Mer
g
e branch 'j
s
/
show'
commit
|
commitdiff
|
tree
2006-12-14
Junio C
Ham
a
n
o
git-rese
t
[--mixed] <t
r
ee> [--] <pat
h
s>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C
Hamano
git-rese
t
: make i
t
wor
k
from with
i
n a s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C
H
amano
gi
t
-fetch: make
i
t work from wit
h
i
n
a subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-14
Junio C
Hamano
Update git-d
i
ff docume
n
tation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Mer
g
e branch 'jc/diff--c
a
ch
e
d'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
amano
git-svn: allow both diff
.
c
olor and c
o
l
o
r
.
d
i
f
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C H
a
mano
config documentation
:
grou
p
color items
t
o
gether
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-blam
e
: show lines attributed to boun
d
ary comm
i
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C
H
a
m
ano
M
e
rge branch 'j
c
/read-tree-ignore
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge bra
n
c
h 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio
C Hamano
M
e
rge b
r
an
c
h '
n
p/addcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge
b
ranch 'lh/branch
-
rename'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio
C Hamano
Merge
branch 'jc/commit-careful'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Me
r
g
e branc
h
'ap/
c
lone-
o
rigi
n
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
erge bra
n
ch 'jc/numst
a
t'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C Hamano
Mer
g
e bran
c
h
'rr/cvsexportcomm
i
t'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
Merge
b
ra
n
ch 'ap/branch
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
branch -
-
color: change def
a
ult co
l
or
s
election
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
M
e
rge
b
r
anch 'js
/
merge'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
s
end
-
pa
c
k: tighten checks for rem
o
t
e nam
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Hamano
g
it-push: ac
c
ept
t
a
g <tag> as
a
dvertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
a
m
a
no
spurious
.
s
p i
n
manpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
git merge: rewor
d
failure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
Revert "git-dif
f
:
I
ntroduce --index and
d
eprecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
a
m
ano
git-pus
h
: document
r
emov
a
l
o
f
rem
o
te ref with :<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C
Hamano
Merge branch 'm
a
ster' into js
/
m
e
r
g
e
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Haman
o
a
d
d
t
e
st case f
o
r
r
e
c
ursive mer
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C
H
ama
n
o
d
i
ff --nums
t
at: show binary with
'
-' to
mat
c
h "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
u
nio C Hamano
shor
t
log: fix
s
egfault on empty au
t
horname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
s
hortlog:
r
emove
"
[PATCH]" pre
f
ix from shor
t
log
output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-10
Junio C Ham
a
no
git-commit: allow --onl
y
to lose w
h
at w
a
s staged earlier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Jun
i
o C Hamano
Document
a
tion/g
i
t-c
o
mm
i
t:
r
e
w
r
i
t
e
to mak
e
it mo
r
e end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Ju
n
io C
H
a
m
a
n
o
git-rerere:
add '
g
c' command
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C Hamano
Fix per
l
/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Hama
n
o
M
e
r
ge branch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2006-12-06
Junio C H
a
mano
git-merge:
fix "fix
c
o
n
fu
s
ion between tag and branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
Hamano
git-me
r
g
e
:
s
quelch nee
d
less error message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ha
m
ano
Merge
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio
C Hamano
git-r
e
s
e
t to re
m
ove "$GIT_D
I
R
/
MERGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
read-
t
re
e
: document --exclude-per-directory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
u
ni
o
C
H
a
mano
Loosen "working f
i
l
e
w
ill be lost"
c
h
eck in P
o
r
cel
a
in-
i
s
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
read-
t
ree: further loosen "
w
o
rking file w
i
ll be lost
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-12-04
Junio C Haman
o
unpack-trees:
mak
e
su
r
e
"
df_conflict_ent
r
y
.
name"
is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio C Ha
m
ano
receiv
e
-pack: do not
in
s
ist on fast-forward outsid
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
me
r
g
e-recursive: use xdl_
m
e
r
ge()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C
H
am
a
no
xmer
g
e
: mak
e
r
eturn value from
x
dl_merge() more
u
s
a
ble
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hama
n
o
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ha
m
an
o
g
it-merge: fix
con
f
usion between tag and branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C
Ham
a
n
o
Merge master
.
kernel
.
o
r
g:/p
u
b/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
tut
o
rial: talk about u
s
er
.
name e
a
r
l
y and don't star
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
M
er
g
e branch '
j
c/globf
e
tch'
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C
H
amano
M
er
g
e
branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2006-11-29
Junio C H
a
mano
git blame -C: fix o
u
tput format t
w
e
a
ks when
c
rossing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio C Hamano
cvsimport: sty
l
e
fixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
unio C H
a
m
a
no
Merge branch
'j
s
/shortl
o
g'
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C
Hama
n
o
Merge bran
c
h
'
j
c
/push-delete-ref'
commit
|
commitdiff
|
tree
2006-11-27
Junio
C
Hamano
M
e
r
g
e branch
'jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
J
u
n
i
o C Hamano
gi
t
-
merge: do
n
o
t l
e
ak rev-parse out
p
ut us
e
d
f
o
r
checking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C
H
ama
n
o
g
i
t
-merge: tighten error checki
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
u
ni
o
C Hamano
M
erge branch 'jc/pack-pee
l
ed'
commit
|
commitdiff
|
tree
2006-11-26
Junio C Hamano
gre
p
:
d
o
n
ot
s
kip unmerged entr
i
es
w
h
en g
r
ep
p
ing in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Junio C Hamano
Merge bra
n
ch 'jn/web'
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
fetch
-
pa
c
k
:
do no
t
ba
r
f
w
hen d
u
plicat
e
re pattern
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-fetc
h
: allow forcing glob
patter
n
in
refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C Hamano
Mer
g
e
branch 'mast
e
r' in
t
o jc/gl
o
bfetch
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
Hama
n
o
git-fetch:
exit wit
h
n
o
n-zero
status w
h
en fa
s
t-forward
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next