repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'fixes'
2005-09-23
Junio C Ham
a
no
Mer
g
e br
a
nch '
f
ixes'
commit
|
commitdiff
|
tree
2005-09-23
Juni
o
C Ha
m
ano
Make 'git diff --cac
h
ed' syno
n
ymous 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 no
t
giv
e
alarming er
r
or message from rsyn
c
in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C
Ha
m
ano
Pr
e
t
t
y
p
rint
o
ctopus merge message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Ha
m
ano
Retire diff-helpe
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio
C Hamano
Retire r
e
v-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retir
e
git-
e
xpor
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
unio
C
Hamano
Revert "Use git-merg
e
instea
d
of g
i
t-res
o
lv
e
in
g
i
t
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C
Hamano
R
evert "Make Octopus merg
e
message a
bit nic
e
r
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Merg
e
bra
n
ch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io
C
Hamano
Fix documentation
d
e
p
end
e
ncy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
a
m
ano
Mak
e
object cr
e
ation in
ht
t
p
fe
t
ch a bit s
a
fer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
u
n
io C Hamano
Clarify dual
l
icense status of subprocess
.
py fi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Update tuto
r
ial with Octopus usage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Haman
o
Make Octopu
s
mer
g
e message
a bit nicer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Hamano
Use git-merge inst
e
ad of
g
it-resolve in git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Do not give al
a
rming error message from rsy
n
c in
f
e
tc
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Ham
a
no
Sh
o
w modified files in git-ls-fil
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
i
o
C Hamano
F
ast-p
a
th
'
update
-
i
n
de
x
--refr
e
sh' a
bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Use GEC
O
S
f
ield a
bit be
t
te
r
to produce defaul
t
human
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
unio C Hamano
Document
-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 own
c
o
py of
s
ubp
r
ocess
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Hamano
show-branch:
Be nicer when runn
i
n
g in
a
corrupt repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Haman
o
G
I
T 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C H
a
man
o
Arrgh
-- another asciidoc ca
r
e
t
workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C H
a
mano
Document exte
n
ded SHA1 use
d
b
y g
i
t-rev-
p
a
r
se
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Hamano
fe
t
c
h() assumes we do not have
the obje
c
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-18
J
u
n
io C Ha
m
ano
Improv
e
the s
a
fety chec
k
use
d
in
fetch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Archive-destr
o
ying "g
i
t repack -a -d" bug
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
D
o not fail after calling bi
s
ect_auto_next()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Jun
i
o C Hamano
F
i
x typ
o
in test c
o
m
m
en
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Jun
i
o C Hamano
[
P
ATCH] g
e
tdo
m
a
i
nname should be us
a
b
l
e
on SunOS
with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Jun
i
o C H
a
mano
Add git-send
-
email t
o
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio
C Ha
m
ano
Teach rs
y
nc tr
a
n
s
port about alternates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
[PAT
C
H]
fetch
.
c: cleanup
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
[P
A
T
C
H
]
M
a
ke git-checkout failure
m
e
s
sage more f
r
iendly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
Reco
m
men
d
'
l
es
s
' for Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
R
e
vert brea
k
age introdu
c
ed by
c
80522e30
f
d
c190f8c8c7
f
c983bbe0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
u
nio C
Hamano
Plug d
i
ff
le
a
ks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Avoi
d
wastin
g
memory while 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
more backward compatible wi
t
h git-ssh-{push,pull}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Unoptimize info/r
e
fs creati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Retire inf
o
/
r
ev-cache
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Ha
m
ano
git-bra
n
ch -d <branch>: delete un
u
sed bran
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C H
a
mano
Revert "[PATCH] plug memory leak i
n
diff
.
c:
:
diff_
f
ree_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C H
a
mano
Make merge comment
g
it-p
u
ll makes fo
r
a
n
octopus a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C
H
a
mano
M
e
rge branc
h
'master' of
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Ham
a
no
read-tree: fix
b
ogu
s
debugging
s
tateme
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
J
u
nio C Hamano
gi
t
-merge
-
rec
u
rsive:
Trivial RE fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
[PATCH] Define relative
.
git/object
s
/info/
a
lternate
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio
C
Hamano
Det
e
c
t
ls-r
e
mote f
a
ilure properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Hama
n
o
Fix off
-
b
y
-one error in git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
am
a
no
P
r
opagate e
r
rors fro
m
f
et
c
h
-
p
ack correctly
to gi
t
-f
e
tc
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Fix CDPATH problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o
C
H
ama
n
o
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
Docum
e
nt git-grep and link
i
t from the
mai
n
git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
ano
[
P
A
T
CH
]
Make 'git ch
e
ckout' a bit
m
ore forgiving when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Hama
n
o
[
PATCH] Omit patc
h
es
that
h
ave already been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
A
l
low find
i
ng th
i
ngs th
a
t
b
egin with a dash
in '
g
i
t
.
.
.
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
Junio
C
Ham
a
n
o
Use
int instead of soc
k
len_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
H
amano
Prepare 0
.
99
.
7 re
l
ease candid
a
t
e
branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o C Ha
m
a
n
o
Add a
n
ew merg
e
s
t
r
ateg
y
by Fre
d
rik Kuiv
i
nen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
'git-merge':
Documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
io C
Hamano
Use Dani
e
l's read-t
r
ee in
the
merge strategy
'resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Haman
o
Multi-backend me
r
ge dri
v
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C
H
a
mano
P
l
u
g leak in Da
n
i
e
l's
r
e
a
d-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Hama
n
o
[PATCH] Add debuggi
n
g help for
c
as
e
#16 to rea
d
-tr
e
e
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C H
a
mano
[
PATCH] Disable de
b
ugging from rea
d
-t
r
ee
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C
H
a
m
ano
Fix 'git-show-branch --list <head>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Ju
n
io C Hamano
Add 'git bi
s
ect repl
a
y
/l
o
g' doc
u
mentatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
u
nio C
H
amano
Keep bisection log so
t
hat it can be replayed lat
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
unio C Ha
m
ano
Fix copy mark
i
n
g
from
d
iffcore-rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Make sure we
have leading director
i
es under refs/{hea
d
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
H
amano
sh
o
w-bra
n
ch
:
--list and --independent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C Haman
o
Reti
r
e suppor
t
for old environmen
t
variables
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C
H
amano
Adjust
.
giti
g
nore for b
i
g rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
Hamano
I
g
nore datestamp
-
only changes
when ins
t
alling webdoc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
Hamano
Squelch
`
r
em
o
val' message fr
o
m 'git reset --har
d
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
'bu
i
ld' scrip
t
s before ins
t
a
lling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C
Hamano
Sho
w
all merge-b
a
s
e
candidate
s
from
s
h
ow-bran
c
h --m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
Documentati
o
n updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Jun
i
o C Hamano
git --versi
o
n tells which ver
s
ion o
f
git you ha
v
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C
Hamano
Big tool
r
ename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio
C
Hamano
GIT 0
.
99
.
6
commit
|
commitdiff
|
tree
2005-09-07
Ju
n
io C Hama
n
o
Documen
t
a
tio
n
updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Juni
o
C
Hamano
Documentation up
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
J
unio C Haman
o
Flatten tools/
di
r
e
c
to
r
y
to make build
p
rocedure si
m
ple
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
J
uni
o
C Hamano
ma
i
linfo
:
barf and exis
t
up
o
n
nested multipart
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
J
u
nio C Hamano
M
erge
branch 'mast
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-06
Junio C Haman
o
F
o
rmat fix for as
c
iidoc
do
c
ument
a
tion titl
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
J
u
nio C
Hamano
Me
r
ge
branch 'master'
of
.
commit
|
commitdiff
|
tree
2005-09-05
Juni
o
C Hama
n
o
Ret
i
re git-clo
n
e
-
d
u
m
b-
h
ttp
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
J
u
nio C Hamano
I
nstall archimp
o
rt-sc
r
ipt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Juni
o
C Hama
n
o
M
e
r
ge
branch 'mas
t
er' of
.
commit
|
commitdiff
|
tree
2005-09-04
Junio
C
H
aman
o
Add copy
/
renam
e
check for git-apply
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio
C
Hamano
Add
a link
from update-server-info do
c
umentation to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hamano
git-app
l
ymbox: fix '-c'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-03
Juni
o
C Haman
o
Document
h
ooks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next