repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Use git-merge in git-pull (second try).
2005-09-29
J
un
i
o C Hamano
Use gi
t
-merge in
git
-
pull (second t
r
y)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
J
u
n
io C
Hamano
U
se
g
it-upda
t
e-ref in
sc
r
ipts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
J
u
n
io C Ha
m
ano
Fas
t
path the
n
o
rmal case by no
t
checking that index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Fix default p
u
ll not t
o
do an unintended O
c
t
opus
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
J
unio
C
Hamano
Updat
e
the cas
e
table in
t/t10
0
0
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Jun
i
o
C
Hamano
Merge mas
t
er
.
kernel
.
org:/home/hpa/gi
t
/
d
aemon
commit
|
commitdiff
|
tree
2005-09-27
Junio C Haman
o
git-commit: us
e
update-index --stdin
,
instead o
f
xarg
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hamano
u
pdat
e
-
index: doc
u
ment --s
t
din and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Ha
m
ano
update-index: --stdin and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Really require tk 8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hamano
Requi
r
e
t
k 8
.
4
(RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C Haman
o
Me
r
ge http:/
/
www
.
ke
r
n
el
.
org/pub/sc
m
/
gitk/gitk
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hama
n
o
git-fetc
h
: send
i
n
f
ormatio
n
a
l outpu
t
to >&2
c
onsistentl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
H
a
mano
Give
d
ef
a
u
l
t
m
erge message after failed automerge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Do not req
u
ire
clean tree when reverting a
n
d cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Fix overzealous cleanline
s
s check in git
-
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
n
i
o C Ham
a
no
g
it-clone: check out "m
a
ster" by defaul
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Ju
n
io C Hamano
Plug a
small race in
u
p
d
ate-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Juni
o
C Hamano
Di
f
f: --name-st
a
tus output format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
Ham
a
n
o
Diff: -l
<
num> to limit rename/copy
detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C Hamano
Diff clea
n
-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C H
a
mano
Merge branch 'fixes
'
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hama
n
o
Clean
generated fil
e
s
a
bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Sto
p
instal
l
ing t
h
e backward com
p
atible s
y
m
l
inks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Haman
o
show-branch:
f
i
x
commit nam
i
n
g breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
H
amano
git-gr
e
p: fix
'
git grep -e $pattern' handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
n
io C Hamano
Rem
o
ve use of
'xargs -0' from g
i
t-reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Use
0
.
99
.
7
.
GIT
as version between 0
.
99
.
7 and 0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
unio C Ha
m
a
n
o
Solaris: give a bit more buil
t
-in defaults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C
Hamano
Really ig
n
ore generated distr
i
bution material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C
H
a
m
a
n
o
daemon
.
c: pid_t
is n
o
t i
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
a
ma
n
o
M
erge
'fixes' b
r
anch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
unio
C Hamano
Furt
h
er clarify licen
s
in
g
statu
s
o
f
c
ompat/subp
r
ocess
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ju
n
i
o
C
H
a
mano
I
gnor
e
a bit more generated f
i
les
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Merge b
r
anch 'f
i
xes
'
commit
|
commitdiff
|
tree
2005-09-23
Junio C
H
amano
Make 'git diff
--ca
c
hed
'
synonymous to 'git
diff
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C H
a
m
a
n
o
Do
n
ot giv
e
ala
r
ming error message from rsync in
f
etch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C
H
a
m
an
o
Prettyprint octopus merge message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
J
u
n
i
o
C Hamano
Retire diff-h
e
lper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Jun
i
o C Hamano
Retire rev-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Haman
o
R
e
tir
e
git-export
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Hamano
Revert "Use git-merge instea
d
of git-resolve in
git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert
"
Make
Oc
t
o
pus merge mes
s
ag
e
a
bit
n
icer
.
"
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio
C
Ha
m
ano
Me
r
ge
b
ranch 'fix
e
s'
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
amano
Fix docume
n
t
ation depen
d
ency
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Make object
c
r
eation
i
n http fetch a
b
i
t safe
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Ham
a
no
Clarify dual
l
ic
e
nse st
a
tus of sub
p
roc
e
ss
.
p
y file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Hamano
Updat
e
tutorial with Oct
o
pus usage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
un
i
o C
H
amano
Make
O
c
topus merg
e
message a
bit nicer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
a
mano
Use g
i
t-mer
g
e in
s
tead of gi
t
-
resolve in g
i
t-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Do not give
a
larming error message fr
o
m
rsy
n
c in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Show modified file
s
in git-ls-files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io C Hamano
F
ast-
p
ath 'update-index --refresh' a
bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Use GE
C
O
S fi
e
ld
a bit bette
r
to produce de
f
ault h
u
m
an
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Hamano
Document -i
f
l
a
g
t
o
git-
r
ead-t
r
ee
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
unio C Hamano
S
h
ip o
u
r o
w
n copy
of subp
r
o
cess
.
p
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
show-br
a
nch: Be nicer when running in a c
o
rrupt reposi
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C
H
amano
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C Ha
m
ano
Arrgh -- another as
c
iid
o
c caret workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
un
i
o
C
Hama
n
o
Document extended SHA1 used b
y
git-rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
ni
o
C Ha
m
a
n
o
fetch() assumes we do
not have the object
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C H
a
ma
n
o
M
erg
e
branch 'master'
o
f
.
commit
|
commitdiff
|
tree
2005-09-18
J
un
i
o C Hamano
Improve the safety check
u
sed in fetch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Juni
o
C
Hamano
Archive-destroying "git repack -a -d" bug
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Do
not
f
ail afte
r
calling bisect_aut
o
_next(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Haman
o
Fix t
y
po in test comment
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
[P
A
TCH]
g
e
tdomainna
m
e should be usable on SunOS
w
i
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Haman
o
A
dd gi
t
-send-ema
i
l to
.
gitign
o
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Ha
m
ano
Teach rs
y
nc
tran
s
port ab
o
ut alternates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Jun
i
o C Hamano
[PATCH]
f
etch
.
c
:
cl
e
anups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
[PATCH] M
a
ke
git-checkout failure message more fri
e
ndly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
R
eco
m
mend
'less
'
fo
r
Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
un
i
o
C
H
amano
R
e
vert breakage introduced by c80522e30
f
dc190f8c8c7f
c
983bbe0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C H
a
m
a
n
o
Plu
g
diff leaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Jun
i
o C Hamano
A
v
oid wasting memory while keeping track
o
f what we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Juni
o
C Hamano
Be more backward co
m
patible with git-ss
h
-{pus
h
,
pull}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C H
a
mano
Unopti
m
ize info/refs creati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
H
amano
R
etire
i
nfo/rev
-
c
ache
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
git-branch
-
d
<branch>:
delete un
u
s
e
d
b
ran
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Revert "[PATCH] p
l
ug memory leak in dif
f
.
c
::diff_f
r
ee_fi
l
epa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Ha
m
ano
Make merge comme
n
t
g
i
t-pu
l
l makes fo
r
an
o
ctopus a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Merge b
r
anch
'
mas
t
er' o
f
.
commit
|
commitdiff
|
tree
2005-09-14
J
u
nio C Hamano
r
ead
-
tree: fix b
o
gus debuggin
g
stateme
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C
Hamano
git-
m
e
r
ge-recursive: Tri
v
ial RE
f
ix
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
a
mano
[
PATCH] Define relat
i
ve
.
git/objects/info/alternates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hamano
Dete
c
t l
s
-remote failure properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Ha
m
ano
Fix
off-
b
y-one err
o
r
in
git-merg
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hamano
Propagate errors from fetch-pack co
r
r
e
ctl
y
to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Haman
o
Fix CDPATH p
r
oblem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Merge
bra
n
ch 'master
'
of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Docume
n
t git-gre
p
a
n
d
l
ink it fro
m
t
h
e
m
a
in git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PATCH] Make
'
git checkout' a bit more f
o
r
g
iving when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Hamano
[PATCH] Omit patche
s
th
a
t have already
b
een
mer
g
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio
C Haman
o
Allow findi
n
g things
t
hat begin with a dash in
'git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Ham
a
no
Merge bra
n
ch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Use int in
s
tead of socklen_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o C Hamano
Prep
a
re 0
.
99
.
7 re
l
ease can
d
idate b
r
anch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Hamano
A
dd a new merg
e
st
r
ategy b
y
Fredrik
Kuivinen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
H
amano
'git-me
r
ge': Documentat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Hamano
U
se Dan
i
el
'
s rea
d
-t
r
ee in t
h
e merge strategy 'resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next