repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: -merge and -pull: describe merge strategies.
2005-10-13
Junio C Haman
o
clone-pac
k
: new optio
n
--kee
p
t
e
lls
it
not to explode
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-13
Junio
C Hamano
F
i
x
packname hash gen
e
r
a
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-13
J
u
nio C
H
amano
g
i
t-am: interacti
v
e shou
l
d
fail gracefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-12
Jun
i
o C Hamano
git-fetch --ta
g
s: d
e
al
with tags with s
p
aces in the
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-12
Junio C Hamano
Q
uote reference nam
e
s while fetching wi
t
h curl
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-12
J
unio C Hamano
Merge
b
r
anc
h
'fixes'
commit
|
commitdiff
|
tree
2005-10-12
Junio C Hamano
Use core
.
filemod
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-11
Junio
C
Hamano
sh
o
w
-bra
n
ch
:
optionally use unique prefix as na
m
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-11
Junio C
H
amano
Remove unused 'g
o
t_altern
a
t
e
s' variab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-11
J
u
nio C
H
ama
n
o
Use
t
he same move_temp
_
to
_
file in git-
h
t
tp-fe
t
ch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-11
Junio C Hamano
Remove em
p
t
y
direc
t
or
i
es after
r
e
ad-tr
e
e -u
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-10
Junio
C Hamano
Merge bran
c
h
'fix
e
s'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-10
Ju
n
io C Hamano
Remove the vers
i
on
t
a
g
s from the m
a
npages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-10
Junio
C Ha
m
ano
Deal w
i
t
h
$
(bindir)
and friends with whitespaces
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-10
Junio C Ha
m
ano
Op
e
nBSD needs the
s
tr
c
ases
t
r repl
a
cement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-10
Junio C Ham
a
no
Also force LC_ALL in test
scr
i
pts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-10
J
un
i
o C Hamano
M
erge bra
n
ch 'fixes
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-10
Junio C Hamano
git-ta
g
:
update
u
sage string
a
nd documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-09
J
unio C
H
amano
M
akef
i
le: avoid error m
e
ss
a
ge
f
rom 'uname -o'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-09
J
u
n
io C Ha
m
ano
M
ake
s
ure 'make install' does n
o
t
have to rebuild te
m
plates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-08
Junio C Hamano
Yank writing-back
support from gitfake
m
m
a
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-08
Junio
C Hamano
Also use 'tr
a
c
k
_
o
bject_refs = 0
'
i
n
u
p
d
ate-server-info
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-08
J
unio C
H
amano
G
i
v
e pr
o
per prot
o
type to gitstrcas
e
str
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-08
J
u
n
i
o
C
Hamano
Merge br
a
nch 'fix
e
s'
commit
|
commitdiff
|
tree
2005-10-07
J
unio
C
Ha
m
ano
Add git-am, applymbox replacement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-07
Ju
n
io C H
a
mano
upd
a
te
-
in
d
ex: read --show-index
-
info outpu
t
from st
a
ndard
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-07
Ju
n
io C Ha
m
ano
git-apply: p
a
rs
e
index informat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-07
Junio C
Ha
m
ano
Sh
o
w
original and re
s
ult
i
n
g blob object info in
d
iff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-06
Ju
n
i
o
C
Hamano
mailspli
t
:
al
l
ow fe
e
din
g
mbox from standard
i
nput
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-06
Junio C Hamano
D
escribe new options to git-f
o
rmat-p
a
tch and git
-
m
ailsplit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-06
Junio C Hamano
m
ailsplit: -d<prec>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-06
Juni
o
C Hamano
git-format-patch: --
s
tdo
u
t o
p
tio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-06
Ju
n
io C Hamano
Clean mail files after dealing with them
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-06
Junio C Hamano
Fa
l
l
b
ack to t
h
r
ee
-
wa
y
merge when
a
pplying a patch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-06
J
u
nio C Hama
n
o
git-shortl
o
g: m
a
k
e
the mailmap configurab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio
C Ha
m
ano
Merge
b
ranch
'
f
i
x
e
s'
commit
|
commitdiff
|
tree
2005-10-05
Junio
C Hamano
clone-pack: use creat
e
_
s
ymref()
instead o
f
raw symlink
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C
Ha
m
ano
up
l
oad-pack: D
o
not choke o
n
too
m
a
ny
heads
r
equest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Haman
o
Fix diff-filter All-Or-None
mark
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
J
u
nio C Hamano
R
e
cord which tree the patch applies t
o
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C
Hamano
git-applypatch: cle
a
nup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Ham
a
n
o
g
it-apply: retire unused/u
n
impl
e
m
ented --no-merge
f
lag
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hamano
git-appl
y
:
a
llow operating i
n
spa
r
sely populated working
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Junio C Hamano
R
eturn err
o
r
w
h
en
n
ot
c
hecking
out a
n
en
t
ry
d
ue to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-05
Ju
n
io
C
Ham
a
n
o
Me
r
ge branch '
f
ixes'
commit
|
commitdiff
|
tree
2005-10-05
Junio C Ha
m
a
n
o
Add missi
n
g
do
c
umenta
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
J
u
n
io
C
Hamano
Remov
e
u
s
e
l
ess us
e
o
f se
d
in git-format-patch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Junio C Hamano
L
eave an em
p
ty
line between log an
d
sign-o
f
f
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Ju
n
io
C
H
a
mano
Remo
v
e unused external-diff
script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Junio C Hama
n
o
On Cy
g
win, u
s
e
sym
b
olic
r
ef, not a s
y
mbolic
link, to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Junio C Hamano
Merge
branch 'fixes'
commit
|
commitdiff
|
tree
2005-10-04
Juni
o
C Hamano
Avoid compiler w
a
rnin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-04
Junio C Hamano
Make sure ge
t
_sha1 doe
s
not
accept ambi
g
u
o
us sha1 prefix
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Junio C H
a
m
ano
Merge
b
ranch 'fixe
s
'
commit
|
commitdiff
|
tree
2005-10-03
Junio C Hamano
[
PATCH] Mergin
g
the
C
y
g
win
c
hanges
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Ju
n
io C Hamano
git
-
pull: do
no
t
bar
f
on -
a
f
la
g
meant
for git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Junio
C
Hamano
Error message fro
m
get
_
sha1() on ambiguou
s
s
h
o
rt SHA1
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Juni
o
C
H
aman
o
Make sure get_sha1
d
oes not accept a
m
biguous s
h
a1
p
refix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-03
Jun
i
o C H
a
mano
F
ix
m
ino
r
DOS
i
n rev-list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Ju
n
i
o
C Ham
a
no
Post 0
.
99
.
8
m
a
s
ter
branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Jun
i
o C Hamano
GIT 0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Ju
n
io C Hamano
Handle really trivial c
a
s
e
inside
git-merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Juni
o
C Hamano
rea
d
-tree: remo
v
e --head option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Jun
i
o
C Hamano
C
u
s
t
o
m
iz
e
git c
o
mmand
for instal
l
a
tions that la
c
k certain
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
J
unio C Hamano
M
o
re portability
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
Add git-symbolic-ref
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
J
u
nio C
H
amano
U
se resolve_r
e
f(
)
t
o
implemen
t
read_
r
ef()
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-10-02
Juni
o
C Hamano
Teach
upda
t
e-ref about a symb
o
lic re
f
stored i
n
a
textfile
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Ju
n
io
C
Hamano
Update par
t
ial
H
T
TP transfers
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio
C Hamano
Pass CVSps gener
a
ted
A U Th
o
r <author@domain
.
x
z
>
intact
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-02
Junio C Hamano
Honor extractor'
s
umask in
git-tar-
t
ree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-01
Juni
o
C
H
am
a
no
Honor u
s
er'
s
u
mask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-01
Jun
i
o C Hamano
Consolida
t
e null_sha1[]
.
Signed-off-by:
Junio C Hamano
<junio@twinsun.com>
commit
|
commitdiff
|
tree
2005-09-30
Junio C
H
amano
Stil
l
i
nstalling
th
e
o
l
d comm
a
n
d names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-30
J
unio C Hamano
Tell which packfile is corrupt whe
n
we die
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-29
Junio C Hamano
Use git-merge
i
n git-pull (
s
eco
n
d tr
y
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
J
u
nio C Ham
a
no
Use gi
t
-updat
e
-ref in scripts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hama
n
o
Fastpath the norma
l
case
by not checking
t
hat index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Fix defa
u
lt p
u
ll n
o
t to do an
u
nintende
d
Octop
u
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Ju
n
io C H
a
ma
n
o
U
p
date the ca
s
e table in t/t1000
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C
Hamano
Merge maste
r
.
kern
e
l
.
o
rg:/home/h
p
a/git/d
a
emon
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
ma
n
o
git-commit: use update-
i
ndex -
-
stdi
n
, instead of xargs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Haman
o
u
pdate-index: do
c
ument --stdin and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
update-index: --stdin and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
Rea
l
ly require tk 8
.
4
(
R
PM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C Hamano
Require tk 8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Haman
o
Mer
g
e
h
ttp:
/
/
www
.
k
e
rnel
.
o
rg/pu
b
/
scm/git
k
/gitk
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git
-
fetch:
s
end in
f
ormational output t
o
>&2 consis
t
e
nt
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hama
n
o
Give
defaul
t
merge message af
t
e
r
f
ai
l
ed automerge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hamano
Do not re
q
uire clean tree when reverting and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C Hama
n
o
Fix
overzealous cleanliness check in git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C Haman
o
g
i
t-
c
lone
:
check ou
t
"mast
e
r" by
d
efault
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Juni
o
C
Ha
m
ano
P
lug a small race in
u
pdate-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o C Hama
n
o
Diff: --nam
e
-st
a
t
u
s outp
u
t forma
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
un
i
o C Hamano
Diff: -l<num>
to lim
i
t rename/copy
d
etection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
H
amano
Diff
c
l
e
an-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Haman
o
M
erge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Clean genera
t
ed f
i
les a bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Juni
o
C
Hamano
Sto
p
installing the ba
c
k
w
ar
d
compatibl
e
sym
l
i
n
ks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ha
m
ano
sh
o
w-branch
:
fix
c
o
m
mit
naming br
e
akage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next