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
H
a
m
ano
Fix
d
efa
u
lt
pul
l
not to d
o
an unintended Octopus
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Up
d
at
e
th
e
case t
a
b
l
e in t/t1000
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hama
n
o
M
e
r
g
e ma
s
ter
.
ke
r
nel
.
or
g
:
/
hom
e
/hpa/git/daemon
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git-commi
t
: use
update-i
n
d
ex --std
i
n, in
s
tead of xarg
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
update-index:
documen
t
-
-stdin and -z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hamano
upd
a
t
e-in
d
ex:
--stdin
a
nd -z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio
C
Haman
o
Really re
q
uire tk 8
.
4 (
R
PM)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C
H
aman
o
Requir
e
t
k
8
.
4 (RPM)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
i
o C
H
amano
Merge ht
t
p://www
.
kernel
.
org/
p
ub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2005-09-27
J
uni
o
C
Hamano
git-fetch:
s
end
informational output to
>&2 cons
i
stentl
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hamano
Give
default merge messa
g
e after failed automerge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C Hamano
Do not require cl
e
an tree
w
he
n
r
ever
t
ing and ch
e
rr
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Fix overzeal
o
u
s
c
l
e
anliness check in git
-
mer
g
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hamano
git-clon
e
: check
o
ut "master" by default
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-26
Jun
i
o C
H
amano
P
lu
g
a smal
l
race in update
-
r
ef
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
D
i
f
f:
--name-status
output fo
r
mat
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Juni
o
C
H
am
a
n
o
Diff: -l<nu
m
> to limit rename/copy det
e
ction
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
io C Hamano
D
i
f
f
c
lean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hamano
Merge branch 'fi
x
es'
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ha
m
ano
Clean generated files a bit more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Sto
p
installing the
backward compatibl
e
symlinks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ham
a
no
show-bran
c
h: fix com
m
i
t nam
i
ng breakage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C Hamano
git-g
r
ep: f
i
x
'
git gre
p
-e $patte
r
n' handli
n
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ha
m
ano
Remove
use
o
f
'xa
r
gs -0'
f
rom git-rese
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Use 0
.
99
.
7
.
GIT
a
s v
e
rsion between 0
.
99
.
7 and 0
.
99
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C Hamano
Sola
r
is:
give a bit
more bui
l
t-
i
n
d
efault
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C Hamano
Rea
l
ly ignore gener
a
ted distribution material
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hama
n
o
daemo
n
.
c
: p
i
d_
t
is not int
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Merge 'fix
e
s' branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
F
u
rth
e
r c
l
arify lic
e
nsing status of
compa
t
/
subpro
c
ess
.
py
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C
H
a
mano
Igno
r
e
a bit more ge
n
erated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Ju
n
io C Hamano
M
erge branch 'fi
x
es'
commit
|
commitdiff
|
tree
2005-09-23
Juni
o
C Hamano
Make
'
git
d
iff --cached' synonymo
u
s to 'git diff -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Ham
a
no
Do not giv
e
alar
m
in
g
error message
f
r
o
m r
s
y
nc in fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
J
u
nio C Hamano
Prettyprint
o
c
t
opus
m
e
rg
e
message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Haman
o
Re
t
i
re di
f
f-hel
p
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
J
unio
C
H
amano
R
et
i
re
rev-
t
re
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire git-export
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
amano
Rever
t
"Use git-merg
e
instead of git-reso
l
ve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "M
a
ke Octopus
m
erge
message a bit ni
c
er
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Merge bran
c
h 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
J
u
n
io C
Ham
a
no
Fix documentation dependency
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Haman
o
Make obj
e
ct
c
r
eation in h
t
tp fetch a bit safer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
mano
Cla
r
ify du
a
l
l
ice
n
se
s
tatus
o
f subp
r
ocess
.
py
f
ile
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C Hamano
U
pda
t
e
tut
o
rial with Octopus usage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
unio C Hamano
Ma
k
e Octopus merge message a bit nice
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Use git-mer
g
e inst
e
ad of git-resolv
e
in
git-p
u
ll
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
unio C
Hamano
D
o
not give alarming error message from rsync
i
n fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio
C Hamano
Show modifie
d
files
in git-ls-files
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io C Hama
n
o
Fast-path 'upda
t
e-index -
-
refresh' a bit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C H
a
mano
Use
G
ECOS field a bit bet
t
er
t
o p
r
oduce default hu
m
an
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Haman
o
Docume
n
t -
i
flag to g
i
t-r
e
ad-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Ship our own cop
y
of subp
r
o
c
ess
.
p
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
show-branch: Be nicer
w
hen running in a corrupt re
p
os
i
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Hamano
GIT 0
.
9
9
.
7
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Hamano
A
r
rgh -- anothe
r
asciidoc caret w
o
rkaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C
H
amano
D
ocument extended SHA
1
us
e
d by git-rev-
p
arse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
fetch() assum
e
s
we do not h
a
ve th
e
object
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
M
e
r
g
e branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Haman
o
Improve the safe
t
y check used in fetch
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Ham
a
no
Archi
v
e-destroying "
g
it repack -
a
-
d
" bug
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Do not fa
i
l
after calling bisect_auto_next()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Ju
n
io C H
a
man
o
Fi
x
typo
in test comment
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
Hamano
[PATCH] getdoma
i
nname
should be u
s
a
b
le on SunOS with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
u
n
io C Hamano
A
d
d
git-send
-
e
mail
to
.
gitigno
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
unio C Hamano
T
e
a
ch
r
sync
transport about alt
e
rnates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Ju
n
io C Hamano
[PAT
C
H] fetch
.
c: cleanups
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
J
unio
C Hamano
[
P
A
TCH] M
a
ke git-c
h
eck
o
ut failure
m
essage more friendly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
Recom
m
end
'
l
ess' for Debian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
R
e
vert
b
reakage
i
n
trod
u
c
e
d by c80522e30fdc1
9
0
f8c
8
c7fc
9
83bbe0
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Plu
g
diff leaks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Ha
m
ano
Avoid wast
i
ng
memo
r
y w
h
i
l
e keeping track of wha
t
we
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
H
a
ma
n
o
B
e
m
o
re bac
k
war
d
compatible with git-ssh-{push,pull}
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
Hamano
Unopt
i
mize info/
r
efs cr
e
ation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io
C Hamano
Retir
e
in
f
o/rev-cache
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C Hamano
git-
b
r
anch -d <b
r
an
c
h>: delete u
n
used
b
ranch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Revert "[PAT
C
H] plug memory leak in
d
iff
.
c::d
i
ff_free_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C
Hamano
Make merge
com
m
ent git
-
p
u
ll makes for an octo
p
us
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Merge br
a
nc
h
'
master'
o
f
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hama
n
o
read-
t
ree
:
f
i
x
b
og
u
s de
b
ugging
statement
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Jun
i
o C Hamano
git-me
r
ge-recursi
v
e: Trivial RE f
i
xe
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Hamano
[PATCH] De
f
ine re
l
at
i
v
e
.
git
/
objects/info/alterna
t
e
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
ano
D
etec
t
l
s-r
e
m
ote failure properly
.
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-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
P
r
o
p
agate err
o
rs from fetch
-
pack correctly to
g
it-fet
c
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
Fix CDP
A
TH problem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C Hamano
Mer
g
e b
r
a
n
ch 'mast
e
r
'
of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
an
o
Docu
m
ent git-gre
p
and
link it f
r
om the mai
n
git(7)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PATCH] Make
'
git c
h
ec
k
out'
a
bit mor
e
forg
i
ving whe
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C
H
amano
[PATCH]
O
m
i
t pat
c
hes t
h
at ha
v
e
al
r
eady
been
merged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio C H
a
mano
A
l
low fi
n
ding
t
hings t
h
at be
g
in wit
h
a
da
s
h in 'gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Merge
bra
n
c
h
'mast
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C Ha
m
ano
Use int instead o
f
socklen_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hama
n
o
Prepare
0
.
9
9
.
7 release
candid
a
te branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o C Ham
a
no
Add a new merge strategy by Fredrik Kuivinen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
H
amano
'gi
t
-merge': Documenta
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ham
a
no
Use Daniel's read-
t
ree in the me
r
ge strat
e
gy
'
resolve
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Multi-backend merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Plu
g
leak in Dan
i
el's read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[
PATC
H
] Add debugging he
l
p
f
or case #16 t
o
r
e
ad-tr
e
e
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next