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
Revert "Use git-merge instead of git-resolve in git-pull."
2005-09-21
J
u
nio
C
Hamano
Re
v
ert "Use g
i
t-merge inste
a
d
of g
i
t-reso
l
v
e
in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Re
v
ert
"
Make Octopus merge message a bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
ano
M
er
g
e branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Hamano
F
ix
docume
n
t
ation dependency
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Hamano
Make object creation in
htt
p
fetch a
b
it safer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Clarify dual licens
e
status of subprocess
.
py file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
a
m
ano
Update
tu
t
orial with Octo
p
us usa
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Ha
m
ano
Ma
k
e
O
c
t
o
p
us merge messa
g
e a bit nicer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Use gi
t
-
m
er
g
e in
s
tead o
f
git-resolv
e
i
n
git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Hamano
Do no
t
give alarming erro
r
mes
s
ag
e
from
r
sync
i
n fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io C Haman
o
Show modi
f
ied fi
l
es in git
-
ls-files
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hama
n
o
Fast-path 'upda
t
e-i
n
dex --refresh' a bit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
unio
C
H
ama
n
o
Use GECOS
field a bit be
t
ter to
pr
o
duce de
f
ault human
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Hamano
Document -i flag to git
-
read-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Hamano
Ship our own copy of su
b
process
.
py
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Hamano
sh
o
w
-branch: Be
n
icer
w
hen running in a corrupt re
p
osi
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
io C
Hamano
GI
T
0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Arrgh -- another asciidoc ca
r
et workaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C
Hamano
Documen
t
extended SHA1 used by
git
-
r
e
v-p
a
r
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Hamano
f
etch
(
) assumes
we do
not hav
e
t
h
e
obje
c
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Merge branch 'master'
o
f
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
I
mprove t
h
e
safety check u
s
ed
in f
e
t
c
h
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hama
n
o
Archive
-
de
s
troying "git r
e
pack -a -d" bug
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
u
n
io C Hamano
Do n
o
t
fail after
c
a
l
ling bisect_auto_
n
ext()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Fix ty
p
o in tes
t
c
omm
e
nt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
[PATCH] ge
t
doma
i
n
n
a
m
e s
h
o
uld be us
a
ble
o
n SunOS with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
H
ama
n
o
Add g
i
t-sen
d
-email to
.
gitignor
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Teach
r
s
yn
c
tr
a
n
sp
o
rt
a
bout alternates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Ha
m
ano
[PATCH] fetch
.
c: cleanups
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio
C Hamano
[PATCH
]
M
ake
git-checkout failure message
m
o
re friendly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C
Hamano
Re
c
o
m
m
end
'
l
ess'
f
o
r
Debian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
J
unio C Hamano
Revert break
a
g
e
i
ntroduc
e
d
b
y
c80522e30fdc
1
9
0f8c8c7f
c
983b
b
e0
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Plug diff l
e
a
ks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io C Hamano
Avoid wasting m
e
mory while kee
p
ing track of what we
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Juni
o
C Hamano
Be more
b
ack
w
ard
comp
a
tible with git-ssh-{p
u
sh,
p
ull}
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Jun
i
o
C Ha
m
ano
Unoptimi
z
e info
/
refs creat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Retire info/rev-ca
c
h
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
J
unio C Hamano
git-branc
h
-d
<
br
a
nch>: delet
e
unused branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Ju
n
i
o C Hamano
Rev
e
rt "[PATC
H
] plug memory
lea
k
i
n diff
.
c
:
:diff_free_
f
ilepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Make merge com
m
ent
g
it-pu
l
l m
a
kes fo
r
an octopus a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Ha
m
ano
M
e
rge
b
ran
c
h 'master' of
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hama
n
o
read-t
r
e
e
: fix bogus de
b
uggin
g
stateme
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Juni
o
C Ham
a
no
git-merge-recursive: Trivial
RE fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PAT
C
H] Define relative
.
git/objects/info
/
alternates
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Hamano
Det
e
c
t ls-rem
o
te
f
a
i
lure pro
p
erly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Hamano
Fix off-by-one error in g
i
t-me
r
ge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hama
n
o
Propag
a
te er
r
ors from fetch-pack correctly
to git-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
n
i
o
C Hamano
Fix CDPATH
p
rob
l
em
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o
C H
a
mano
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ham
a
no
Docume
n
t g
i
t-g
r
ep and link it fro
m
the main
git(7)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[
P
ATCH] Make 'git c
h
e
ck
o
ut' a bit more forgiving when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C Ha
m
ano
[PA
T
C
H] Omit patches t
h
at have alrea
d
y
been me
r
g
e
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hama
n
o
Al
l
ow finding thi
n
gs that be
g
in wit
h
a dash in 'git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Juni
o
C Hamano
M
e
r
g
e branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-12
Ju
n
io C Hamano
Use int ins
t
ead of soc
k
len_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio
C
Hamano
Prepare 0
.
9
9
.
7
release candidate branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Haman
o
Add a n
e
w merge str
a
t
eg
y
by Fredrik K
u
ivinen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
n
i
o C Hamano
'
git-mer
g
e': Documenta
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hamano
Use Daniel's read-tree
i
n
t
he merge strateg
y
'reso
l
ve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C H
a
mano
M
ult
i
-
b
a
ckend merge d
r
iver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Ha
m
ano
Plug leak i
n
Daniel's rea
d
-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[PATCH] Add debugging help f
o
r c
a
se #16
to re
a
d-
t
ree
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
Hamano
[PATCH] Disa
b
le d
e
bugging from
r
e
ad-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Haman
o
Fi
x
'git-show-branch --list <head>'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C
H
amano
Add 'git bi
s
ect replay/log' docu
m
en
t
ation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Keep bisecti
o
n
l
o
g so that it can be r
e
played later
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C
Hamano
Fix c
o
py
m
arking from
d
iff
c
ore-rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Make sure we have leading dir
e
ctori
e
s under refs/{heads
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Juni
o
C
Hamano
sh
o
w-
b
ra
n
ch: --
l
ist and
-
-independe
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C Hamano
Retire suppor
t
for
old e
n
viro
n
ment
v
ariables
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Ham
a
no
Ad
j
u
st
.
gitignore for big rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Juni
o
C Hamano
Ignore
d
atestamp-only
c
han
g
es when inst
a
l
l
ing webdoc
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C H
a
mano
S
quelch `rem
o
val
'
me
s
sage fro
m
'gi
t
reset --h
a
rd'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
Hamano
'bu
i
ld' sc
r
ipts before installing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C
H
ama
n
o
Show all mer
g
e-base
c
andida
t
es
from show-
b
ranch -
-
merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C Hamano
D
o
cumentat
i
on up
d
ates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
git --ve
r
sio
n
tells whi
c
h version of git yo
u
have
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
J
u
nio C Hamano
Big tool re
n
ame
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio
C
H
am
a
no
GI
T
0
.
9
9
.
6
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Documentation updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Ju
n
io C Haman
o
D
o
cume
n
tation
u
pdates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hama
n
o
Flatten
tools/
d
irectory to make
b
u
ild pr
o
cedure simpler
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Junio C H
a
mano
mailinfo: b
a
rf
and exist upo
n
nested multipart
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Jun
i
o
C Ham
a
no
Merge
b
ranch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-06
J
un
i
o
C
Hamano
Format
f
i
x f
o
r asciidoc doc
u
menta
t
ion t
i
tles
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hama
n
o
M
erge branch 'mast
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-05
Ju
n
io
C Hamano
Reti
r
e
g
it-
c
lone
-
dumb-http
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Junio
C Hamano
I
n
stall archimport-script
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hamano
Merge
b
ranch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-04
Junio
C Ha
m
ano
Add
copy/ren
a
me 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 fro
m
update-server-
i
nfo docu
m
entation t
o
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Ju
n
io
C
Ha
m
ano
git-applymbox: fix '-c'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-03
Junio
C Haman
o
Docume
n
t hooks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Haman
o
Merge b
r
anch '
m
a
st
e
r
'
of
.
commit
|
commitdiff
|
tree
2005-09-02
J
u
ni
o
C
H
a
mano
Me
n
tion post-update w
h
en w
e
firs
t
talk about pu
b
lis
h
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Ha
m
ano
s
c
ript
s
: e
q
uality test '==' is not portabl
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Hamano
git-
c
heckout
-
s
c
ript: Remov
e
un
n
eces
s
ary
v
ariable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Hamano
Fix automerg
e
m
e
ssage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-01
Juni
o
C Hama
n
o
Add repo
s
itory-l
a
yout docume
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-01
Junio C Hamano
Me
r
ge refs/heads/master
f
rom
.
commit
|
commitdiff
|
tree
next