repo.or.cz
/
git
/
jrn.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
J
unio C Hamano
Fix
default pul
l
not to do
a
n u
n
i
n
tended Octopu
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Ju
n
io C Hamano
Update the case table
i
n t/t1000
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C
H
amano
M
erge mast
e
r
.
kernel
.
o
r
g:
/
home/h
p
a/git/d
a
em
o
n
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C Ha
m
ano
gi
t
-
c
om
m
it: use update-index --stdin,
i
ns
t
ead o
f
xar
g
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
update-ind
e
x: document -
-
stdin and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C Hamano
upd
a
t
e-index:
-
-stdi
n
and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Ha
m
ano
R
e
ally r
e
quire tk 8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
H
amano
R
e
quire tk 8
.
4
(RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C Ham
a
no
Merge http
:
//
w
ww
.
kernel
.
o
r
g
/pub/
s
cm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git-fetch: send in
f
ormationa
l
output
t
o >&2
c
onsistently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o C H
a
mano
Give de
f
a
ult merge
mes
s
age
a
f
ter fai
l
ed automer
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Ha
m
ano
Do n
o
t require clean t
r
ee
when reverting and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C Hamano
Fix
o
verz
e
alous cle
a
nl
i
ne
s
s check in git-mer
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o C Ham
a
no
git-clone: chec
k
o
u
t
"master" by default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
J
unio
C H
a
mano
Plug
a
s
m
all race in u
p
date-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff: --
n
ame-status outp
u
t format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
i
o
C
Ham
a
no
Diff: -l<nu
m
>
t
o
limit ren
a
me
/
cop
y
de
t
ection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ham
a
no
Diff clean
-
u
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C Hama
n
o
Merge bran
c
h 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio C
Hamano
C
lean
g
enerated file
s
a bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Stop insta
l
ling the
b
ackward comp
a
ti
b
le sy
m
links
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C H
a
mano
show-br
a
n
c
h
: fix commit naming
breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
mano
git-grep: f
i
x 'git g
r
ep -e $pattern' handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
a
mano
Rem
o
ve u
s
e of 'xargs -0' from
git-reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
U
se 0
.
99
.
7
.
GIT as version be
t
ween 0
.
99
.
7
and 0
.
9
9
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Solaris: give a bit
more built-i
n
d
efaults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
Hama
n
o
R
eally igno
r
e
gene
r
ated distri
b
ution material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Haman
o
daem
o
n
.
c: pi
d
_t is not int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C Hama
n
o
M
e
rg
e
'fixes' bran
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Juni
o
C Ham
a
no
Furt
h
er clarify lic
e
ns
i
ng status of compat
/
subprocess
.
p
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Ham
a
n
o
Ignor
e
a
b
it more generated
f
iles
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
J
u
n
io C
H
amano
Merge
b
ranch
'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Junio C
Hama
n
o
Make 'git d
i
f
f
--cached'
s
ynonymous to
'
git diff -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Ha
m
a
n
o
Do not give al
a
rming error
message fr
o
m rsync i
n
f
e
t
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C
H
a
mano
P
rettyprint octopus merge message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C
Hamano
Retir
e
diff-helper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C
Haman
o
Retire rev-tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
i
o
C Hamano
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
Revert "U
s
e git-me
r
ge instead of git-resol
v
e in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
mano
Re
v
ert
"
Make O
c
topus
m
erge message a
b
it nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C
Ha
m
a
n
o
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Haman
o
Fix docu
m
e
n
tation dep
e
ndency
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Ham
a
no
Make object creation in http fetc
h
a bit saf
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
mano
Clar
i
fy dual license status o
f
su
b
proc
e
ss
.
py f
i
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Update
t
utorial wi
t
h
Oc
t
opus usage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C H
a
mano
Make
Octop
u
s merge mes
s
age a b
i
t n
i
c
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
unio C Ha
m
ano
Use git-merge instead of git-resolve
i
n
git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
n
io C Hamano
Do n
o
t give alarming
e
r
ror messa
g
e from rsync in
f
etch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
a
m
a
no
Show mod
i
fied f
i
les in git-ls
-
files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
F
ast-path 'u
p
date-i
n
d
ex --ref
r
esh'
a
b
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
un
i
o C
H
a
m
a
n
o
U
s
e
G
E
COS f
i
eld a bit better to prod
u
ce def
a
ult human
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
Docume
n
t -i flag to git-read-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Ship our o
w
n c
o
py of
subpr
o
cess
.
p
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
show-bran
c
h:
B
e nicer when running in a cor
r
upt
r
epository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
Hamano
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C
Hamano
Arrgh -- ano
t
her asciidoc care
t
workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Ha
m
a
n
o
Document extended SH
A
1
u
sed
b
y gi
t
-rev-p
a
rse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
io
C
Hamano
fe
t
ch
(
) assumes we do not ha
v
e the object
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C H
a
man
o
Merge branc
h
'mast
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Improve the saf
e
ty ch
e
ck used in fetc
h
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
A
r
chive-destroyi
n
g
"g
i
t re
p
ac
k
-a -d"
b
ug
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Ham
a
n
o
Do not fail after calling bisect_auto_n
e
x
t
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
u
nio C Hamano
F
i
x typ
o
in test comment
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Ju
n
io
C Hamano
[PA
T
CH] getdomainname should b
e
usable on SunOS w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hama
n
o
A
d
d git-send-email to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Ham
a
no
T
each rsync transport about alternat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
u
nio C H
a
mano
[PATCH] fet
c
h
.
c: cl
e
a
nups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
[PATCH] Make
g
it-checkout failure message
m
ore frie
n
dl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C
H
a
m
ano
Re
c
ommend 'l
e
s
s' for Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
u
n
i
o
C Hamano
Revert breakage introdu
c
ed
b
y c
8
052
2
e30fdc
1
90
f
8c8c7fc
9
83bbe0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Juni
o
C Hamano
Plug di
f
f leaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
Hamano
Avo
i
d wasting mem
o
ry wh
i
le kee
p
ing trac
k
of what we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io C Hamano
Be more backward compatible wi
t
h git-ssh-{
p
ush,pull}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
u
nio C Hamano
Unoptimize info/re
f
s creation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Jun
i
o C
H
am
a
no
Re
t
i
re
i
n
f
o/rev-cache
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
u
nio C H
a
mano
git-branch -
d
<branch>: delete unused branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Revert "[
P
ATCH]
plug
mem
o
ry l
e
ak in diff
.
c:
:
diff_f
r
ee_f
i
lepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Juni
o
C H
a
mano
Make me
r
g
e
co
m
m
ent git-pull makes fo
r
an
oct
o
pus a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Ha
m
ano
Merge
b
ranch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
read-t
r
ee: fix bogu
s
debuggin
g
sta
t
e
m
ent
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
J
u
n
io
C
Hamano
git-mer
g
e-rec
u
r
s
ive:
T
rivial
RE fix
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PATCH] Defin
e
relat
i
ve
.
git
/
objects
/
info/alterna
t
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Hamano
Detect
l
s-remote failu
r
e prop
e
rly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Haman
o
Fix off-by-
o
ne er
r
o
r
in git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
n
io C
H
a
mano
Propagate e
r
rors fro
m
fetch-pac
k
correctl
y
to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C
H
aman
o
Fix CDPATH
problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
ni
o
C Hamano
Merg
e
branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
i
o C Haman
o
Docume
n
t
g
it-grep and
l
ink it fr
o
m t
h
e main g
i
t(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Haman
o
[P
A
T
C
H
]
M
ake
'git chec
k
ou
t
'
a bit
more forgiving
w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PATCH] Omit p
a
tches that have alre
a
d
y been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
J
unio C Ham
a
no
A
llow fin
d
ing things that begin w
i
t
h
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' of
.
commit
|
commitdiff
|
tree
2005-09-12
J
un
i
o C Hama
n
o
Use int
inst
e
ad of
s
o
cklen_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Prep
a
re 0
.
99
.
7 relea
s
e ca
n
didate branc
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio
C
Hamano
A
d
d a new
m
erge strategy by Fredrik Kuivinen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
Hamano
'gi
t
-merge'
:
Do
c
umentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
un
i
o C
H
am
a
no
Use Daniel's read-tree in the
merge
s
t
r
at
e
gy 'resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
M
u
l
t
i-
b
a
c
kend
merge
driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o C Hamano
P
lug leak in
D
aniel
'
s read-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hama
n
o
[PATCH
]
Add debugging
hel
p
fo
r
case #16 t
o
read
-
tree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next