repo.or.cz
/
git.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
Junio
C
Hama
n
o
R
e
vert "Use git-merge instead of git-resolve
in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
J
unio C H
a
mano
Revert "Make
O
c
topus merge messa
g
e a bit
n
icer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
ano
Merge branch 'f
i
xes'
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio
C
Hama
n
o
Fi
x
documentation
dependenc
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Make object crea
t
ion in http f
e
tch a b
i
t safer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o
C Ha
m
a
no
C
larify dual license sta
t
us of subp
r
ocess
.
py f
i
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
amano
Upda
t
e tutorial with Octopus usage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Make
Octopus merg
e
message
a bi
t
n
i
ce
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C Hamano
Us
e
git-me
r
g
e instead of
g
i
t
-
r
eso
l
ve in
git-
p
ull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
Hamano
Do not
give
alar
m
ing
e
rror
m
es
s
ag
e
fro
m
rsync in fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Haman
o
Show modified files in git-ls-f
i
les
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Fast-path 'update-inde
x
-
-
refr
e
sh' a
bit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
aman
o
U
se GECOS f
i
eld a bit better to produce default human
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ham
a
no
Document
-
i f
l
ag to gi
t
-read-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ham
a
no
Ship ou
r
own copy of subprocess
.
py
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
u
ni
o
C Hamano
show-branc
h
:
Be nicer when
runn
i
n
g
in
a
corru
p
t repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
J
unio C Hamano
GI
T
0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C
H
am
a
no
Ar
r
gh -- a
n
other a
s
cii
d
oc
c
aret wor
k
ar
o
und
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Document extended SHA1
used
b
y git-
r
ev-pars
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
fetch()
a
ssumes we do
n
ot
have
t
he object
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Me
r
g
e
br
a
nch
'
master' of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C
Hamano
Improve th
e
safety check use
d
in
fetch
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o
C
Hamano
Arch
i
ve-destroyin
g
"git repack -a -d"
b
ug
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
unio
C
Hamano
Do not fa
i
l after calling bisect_auto_ne
x
t()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Fix t
y
po
in
test comment
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
[PATCH] get
d
o
m
a
inname sh
o
uld b
e
us
a
b
le on Su
n
OS wi
t
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Add git-send-em
a
il
to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Teach rs
y
nc transpo
r
t about a
l
t
e
rnates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
[PA
T
CH]
fe
t
ch
.
c: cleanups
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
J
unio C Ha
m
an
o
[PATCH] M
a
ke git-che
c
kout failure
m
essage more f
r
iendly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
J
u
ni
o
C Hamano
Recomm
e
nd 'le
s
s' for Debi
a
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio
C
Hama
n
o
Revert breakage intr
o
du
c
ed by c80522e30fdc190f8c8c7fc983bbe
0
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Haman
o
Plug diff le
a
ks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
A
v
oid wastin
g
me
m
ory while keeping
track of w
h
at we
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io C Ha
m
ano
Be more backward compatib
l
e with g
i
t
-
ssh-{
p
us
h
,pull}
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Ham
a
no
Unopti
m
iz
e
in
f
o
/
r
efs creation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
H
amano
R
e
tir
e
info/rev-cache
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
git-bra
n
c
h -d <b
r
an
c
h>: delete unuse
d
bra
n
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
R
e
vert "[PATCH] plug memory le
a
k in diff
.
c::diff_free_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio
C Hamano
Make merge comment g
i
t-pull makes for an octo
p
u
s a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Juni
o
C Hamano
Merge b
r
a
nch 'mast
e
r
' of
.
commit
|
commitdiff
|
tree
2005-09-14
J
u
nio
C
H
amano
r
e
ad-tre
e
: fix bogus debugging statement
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
git-m
e
rge-recursi
v
e:
T
rivial RE
f
ixe
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hama
n
o
[
P
ATCH] Define relative
.
git/o
b
jects/
i
nfo/alternat
e
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Hama
n
o
Detect ls
-
r
e
mote failure properly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
F
i
x off-by-one error
i
n git-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Propagate errors
from fet
c
h
-p
a
ck
corre
c
tly
t
o gi
t
-
f
et
c
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
ano
F
ix CDPATH p
r
o
b
l
e
m
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C H
a
m
a
no
Merge branch 'ma
s
te
r
' of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Doc
u
ment git
-
gre
p
an
d
link it from the mai
n
g
i
t(7)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C Ha
m
ano
[PATCH] Make 'git ch
e
ckout' a bit more fo
r
giving when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hamano
[PATCH] Omit patches tha
t
h
a
v
e already been
m
erged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Jun
i
o C Ham
a
no
Allow finding thing
s
that b
e
g
i
n with
a dash in 'gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
J
u
n
io C
Hamano
Merge
b
ranch 'mast
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-12
Jun
i
o C
H
amano
Use int
instead of socklen_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Ha
m
a
n
o
P
repare 0
.
99
.
7 rel
e
a
s
e candidate
branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Haman
o
Add a
new merge str
a
tegy by Fredrik Kui
v
i
n
en
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C H
a
mano
'git-mer
g
e': Document
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C
Ham
a
n
o
Us
e
Daniel's read
-
tree
in t
h
e merg
e
strategy 'resol
v
e
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
H
amano
Multi-backend merge driv
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Haman
o
Plug leak in Da
n
iel'
s
read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Hamano
[PATCH]
A
dd debu
g
gi
n
g he
l
p fo
r
ca
s
e
#
16 to read-tree
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[PATCH] Di
s
ab
l
e
debugging from read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
an
o
Fix 'git-show-branch --l
i
st <
h
ead>'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
A
dd '
g
it bisect rep
l
ay/l
o
g
'
documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
J
u
nio
C
H
amano
Keep bisecti
o
n log so that it can
b
e
replayed
l
ater
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Fix copy
marking from diffcore-ren
a
me
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Juni
o
C Hama
n
o
Make s
u
re we have lead
i
ng directories u
n
der refs/{heads
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
show
-
branch: --li
s
t and --in
d
ependent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Retire
suppor
t
for ol
d
environ
m
ent varia
b
les
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
J
u
nio C
Ha
m
ano
Adjust
.
gitignore for big rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C Ham
a
no
Igno
r
e
d
ates
t
amp-only chang
e
s when i
n
sta
l
ling w
e
bdoc
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
Ham
a
no
S
q
uelch `removal' message from 'git
r
es
e
t --h
a
rd'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C Hamano
'
b
uild'
s
cripts
before installi
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Ham
a
no
Show all mer
g
e-ba
s
e candidates f
r
om show-branch --merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio C
H
a
m
ano
Documentation updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Juni
o
C H
a
m
a
no
git
-
-
version tells which version
o
f gi
t
you
have
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
J
u
n
io C Hamano
Big tool ren
a
me
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Jun
i
o C Hamano
G
IT 0
.
9
9
.
6
commit
|
commitdiff
|
tree
2005-09-07
Jun
i
o C Hamano
Documentation
u
pda
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Ha
m
ano
Documentation up
d
ates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio
C
Hamano
Flatte
n
t
ools/
d
i
rectory
to make build procedur
e
simpler
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Jun
i
o C
H
amano
mailinfo: barf and exis
t
up
o
n nested mu
l
tipart
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hama
n
o
Merge branch 'master
'
of
.
commit
|
commitdiff
|
tree
2005-09-06
J
u
n
io
C H
a
mano
Format fix f
o
r
asc
i
idoc d
o
cu
m
entation tit
l
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Merge bran
c
h 'master' of
.
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Retire
git-clone-du
m
b
-http
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Ham
a
no
Install arch
i
mport-s
c
ript
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Ham
a
no
Merg
e
branch 'master'
o
f
.
commit
|
commitdiff
|
tree
2005-09-04
J
unio C Hamano
Add copy/
r
ename 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-in
f
o documentation to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Junio C H
a
mano
g
it-app
l
ymbox: fix '-c'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-03
J
u
ni
o
C
H
amano
Document ho
o
ks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Junio
C Ham
a
no
M
erge branch
'
master' o
f
.
commit
|
commitdiff
|
tree
2005-09-02
Ju
n
i
o
C Hamano
M
e
ntion post-update whe
n
we first talk about
p
ublishi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Hamano
scripts: equali
t
y test '
=
=' is not
p
o
rtable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
J
unio C Haman
o
git-checkout-script: Remove unnecessary v
a
riable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Junio
C H
a
mano
Fix automerge m
e
ssage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-01
Jun
i
o C Hamano
Add r
e
p
o
sitory-layout document
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-01
Junio
C
Hamano
Merge re
f
s
/he
a
ds/mast
e
r
f
rom
.
commit
|
commitdiff
|
tree
next