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
Fix default pull not to do an unintended Octopus.
2005-09-28
Junio C Hamano
Fix default pu
l
l
n
o
t to do
a
n unintended Octop
u
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Upda
t
e the case
table in t/t1000
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C
H
amano
Merge m
a
ster
.
kernel
.
org:/home/hpa/git/d
a
emon
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hamano
git-commit: use update-ind
e
x --st
d
in, instead of xarg
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio
C
H
a
ma
n
o
up
d
ate-
i
ndex: docu
m
ent --stdin an
d
-z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hama
n
o
update-index: --stdin and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C Hamano
Really requ
i
r
e
tk 8
.
4
(RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C
H
amano
Require tk 8
.
4
(RP
M
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o
C
Ham
a
no
Merge http://
w
ww
.
kernel
.
o
r
g/pub/scm/
g
itk/
g
itk
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o C Ham
a
no
git-
f
et
c
h: send in
f
ormational output to
>&2
c
ons
i
stentl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
n
io C Ha
m
ano
G
i
ve default merge mess
a
g
e a
f
ter failed automerge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
u
n
i
o C
H
a
mano
Do not
requ
i
re clean tree when revert
i
ng and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C
Hamano
Fi
x
overzealous
c
l
e
anlin
e
ss che
c
k i
n
git-mer
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C Hama
n
o
git-clone: check out
"mast
e
r"
by default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Ju
n
io C Hamano
Plu
g
a small race in upd
a
t
e-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C Hamano
Diff: --na
m
e-status ou
t
put format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
H
amano
Diff: -l<num> to l
i
m
it rename/copy
d
etectio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff cl
e
an-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
H
a
mano
Merge b
r
an
c
h 'fi
x
es'
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Hamano
Clean
g
enerated f
i
les a bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
Ha
m
ano
Stop ins
t
alling the back
w
a
r
d
c
ompatible symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
show-branch: fix co
m
mit naming
b
reakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Haman
o
git-grep: fix 'git grep
-
e
$pattern' han
d
ling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio
C
Hamano
Remove use o
f
'xargs -0'
from
g
it-rese
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
H
ama
n
o
U
s
e
0
.
99
.
7
.
GI
T
as versio
n
between 0
.
99
.
7 an
d
0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
mano
Solaris: give a bit mo
r
e
b
uilt
-
i
n
d
efaults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
amano
Reall
y
igno
r
e
g
e
n
e
rated distr
i
bution mate
r
ial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
un
i
o C Hamano
daemon
.
c: pi
d
_t i
s
not int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
n
io C
Haman
o
Me
r
ge '
f
ixes' bra
n
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
Hamano
F
u
rther clarify
licensing status
of
c
ompat/su
b
pr
o
cess
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
J
u
n
io
C
Hamano
Ignore a bit more generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Haman
o
Merge
branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Junio
C
Haman
o
Make 'git
d
iff --cach
e
d' synonymous to 'git diff
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Do not give alarming error
m
essage from
r
sync in
f
et
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C
H
ama
n
o
Pre
t
typrint octopus merge message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio
C
Hamano
Retire diff-helper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
J
unio
C Hamano
Retire rev-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C
Ham
a
no
Retire git-ex
p
ort
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
ma
n
o
R
e
v
e
rt "Use git
-
merge in
s
tead of git-resolve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Hamano
Rev
e
rt "M
a
ke Octo
p
us merge message a
bit n
i
c
e
r
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Me
r
ge
branc
h
'fixe
s
'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hama
n
o
Fi
x
do
c
umen
t
ation dep
e
n
d
e
n
cy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Hamano
Ma
k
e object
creation in http
f
etch a
bit safe
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Cla
r
ify dua
l
license status of
s
u
bprocess
.
p
y
fil
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C Haman
o
U
p
d
a
te tut
o
rial
with Octopus usage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
Hama
n
o
Make Oct
o
p
us mer
g
e message a bit nicer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
i
o
C
H
amano
U
s
e
g
it
-
me
r
ge
inst
e
ad of g
i
t-res
o
lve in git-pu
l
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C Ham
a
no
Do not give
a
l
arming err
o
r m
e
ssage from rsyn
c
i
n
fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Sho
w
modified fil
e
s in git-ls-files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C Hamano
F
a
st-path 'update-index --refresh' a bi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
U
s
e GECOS
field a bit better to pr
o
duce default human
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io C
H
am
a
n
o
Document -i fla
g
t
o git-read-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
S
hip our
o
wn c
o
py of subprocess
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Jun
i
o C Hamano
sh
o
w-branc
h
: Be n
i
cer when runn
i
ng i
n
a corru
p
t repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Haman
o
G
IT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C
Hamano
Arrgh -- another a
s
ciidoc
caret workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hama
n
o
D
o
c
ument ex
t
ended SHA1 us
e
d by git-re
v
-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Juni
o
C Hamano
fet
c
h() assumes we do
n
o
t hav
e
the object
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
io C Hamano
Merge
b
ranch
'mas
t
er' of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C Ha
m
ano
I
m
prove the sa
f
ety
c
heck us
e
d in
fetch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Juni
o
C Hamano
Archiv
e
-
d
estroying "git repack -a -d" bug
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Jun
i
o C
H
a
mano
D
o
not fail after calling b
i
sect
_
a
uto_n
e
x
t()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Ju
n
io C
Hama
n
o
F
i
x t
y
po in test c
o
mment
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Juni
o
C Hamano
[PA
T
CH]
g
etd
o
mainname sho
u
ld be
u
sable on SunOS wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
unio C Ha
m
ano
Add git-send-email to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
H
a
m
ano
Teach rs
y
nc
tran
s
port about
al
t
e
rna
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Ha
m
ano
[PA
T
CH] f
e
tch
.
c: c
l
eanups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
unio C Ha
m
ano
[PAT
C
H
] Make git
-
checkou
t
failu
r
e messa
g
e mo
r
e
frie
n
dly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Ju
n
io C
H
amano
Recommen
d
'less' for Debi
a
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C
H
ama
n
o
Re
v
ert breakage introduc
e
d by c80522e30
f
dc190f8c8c7fc983
b
b
e0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
Hamano
Plug diff lea
k
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
H
amano
Avoid wa
s
ting mem
o
ry wh
i
le ke
e
ping track of what we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
Hamano
Be
m
ore backwa
r
d compati
b
l
e
w
ith git-ssh-{push
,
pu
l
l}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Juni
o
C Hamano
Unoptimize inf
o
/r
e
fs cr
e
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Jun
i
o C Haman
o
Retire info/re
v
-cach
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Juni
o
C
Ha
m
ano
g
i
t
-b
r
anch -d
<
branch>: delete unused branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
J
unio C Hamano
R
e
vert "[PATCH] plu
g
mem
o
ry leak in
d
iff
.
c::diff_f
r
ee_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Make mer
g
e co
m
men
t
git-p
u
l
l
ma
k
es for an octopu
s
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
J
unio C Hama
n
o
Mer
g
e
bra
n
c
h
'master' of
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C
Hamano
re
a
d-tree:
f
i
x bogus deb
u
gg
i
ng st
a
te
m
ent
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Juni
o
C Ham
a
no
git-merge-rec
u
rsive: Trivial
R
E
f
i
xes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C Hamano
[P
A
TCH] Defi
n
e re
l
ative
.
git/o
b
jects/inf
o
/al
t
erna
t
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
D
e
tect ls-remote
f
a
ilure p
r
operly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Ham
a
no
Fix o
f
f-by-one e
r
r
or in git-m
e
rge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Hamano
Pro
p
ag
a
te errors from fetch-pack correctly
to g
i
t-fe
t
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hamano
Fix
CD
P
ATH problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Haman
o
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio
C Hamano
Doc
u
ment git-grep
a
nd
l
ink it fro
m
the main git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C Hamano
[
PATCH] Ma
k
e 'git
c
he
c
kout' a bit more forgiving wh
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Ha
m
ano
[PATC
H
] Omit patches that
have al
r
ead
y
been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Juni
o
C Hamano
Allow f
i
nding
things that
b
egin w
i
th a das
h
in 'git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Merge branch
'master' o
f
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C Ham
a
n
o
Use int inst
e
a
d
of
s
ocklen
_
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Prepare 0
.
99
.
7 release candidate
b
ranch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o C H
a
ma
n
o
Add a
new merge stra
t
e
gy by Fredrik Kuivinen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
ano
'git-merge': Doc
u
ment
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Hamano
Use Dani
e
l's re
a
d-tree in
t
he merge strategy 'resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
ni
o
C Hamano
Multi-
b
ackend merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Plug le
a
k in Dani
e
l's read-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
ano
[PATC
H
]
A
dd debugging he
l
p
for cas
e
#16 to read-tree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next