repo.or.cz
/
git
/
git-svn.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
H
amano
Revert "Use git-merge inste
a
d of gi
t
-resolve i
n
git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hama
n
o
Rever
t
"Make Octopus merg
e
message a bit
n
icer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Merge branch 'fi
x
es'
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C Hamano
Fix documentatio
n
d
ependency
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Make object
c
reatio
n
i
n
h
tt
p
f
e
tch
a bit safer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ham
a
no
C
larify du
a
l license stat
u
s
of su
b
pr
o
cess
.
p
y
file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C Hamano
Update t
u
tori
a
l with
O
ctopus
u
sage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Make Octopus merge message a bit n
i
cer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
u
n
io C Ham
a
no
Use git-merge
i
nste
a
d
o
f git-reso
l
v
e
in g
i
t-pul
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C H
a
mano
Do n
o
t give a
l
arming error message from rsyn
c
in fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Jun
i
o C Ha
m
ano
Show mod
i
fi
e
d files in
git-
l
s-files
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
i
o
C
Hamano
Fast-path
'
update-index
-
-ref
r
esh' a
b
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Us
e
GEC
O
S
field a bit better
to produce de
f
ault human
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Documen
t
-i
fla
g
to git-re
a
d-t
r
ee
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Ship our own copy of
s
u
bprocess
.
py
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io C Ham
a
no
show-branch:
B
e nicer
when runnin
g
in a cor
r
upt
repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
i
o
C H
a
mano
G
I
T 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Arrg
h
-
-
a
noth
e
r asciidoc caret worka
r
ound
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
D
o
cume
n
t ext
e
nded SHA1 used by git-rev-par
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C
H
a
m
a
n
o
fe
t
ch() assumes
we do not hav
e
the objec
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
J
unio
C
Hamano
Merge br
a
n
ch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Hamano
I
mprove the safety c
h
eck
used
i
n
fetch
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Archive-destroying "git re
p
ack -a -d" bug
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Juni
o
C Hamano
D
o
not fail a
f
t
er ca
l
ling bisect_
a
uto_next()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Ju
n
io C Hamano
Fix typ
o
in te
s
t
c
om
m
e
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Ju
n
io C
Hamano
[PATC
H
] getdo
m
ainname sh
o
u
ld be u
s
able on Su
n
OS wi
t
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio
C
Ha
m
a
no
Add git
-
send-email to
.
g
i
tignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
Hamano
Teach rsync transport about alternates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio
C Hamano
[PATCH]
f
etc
h
.
c:
clean
u
ps
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C H
a
mano
[
P
ATCH]
Make git-c
h
eckout fa
i
l
u
re message more
frie
n
dly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
Rec
o
mmend
'less' f
o
r Debian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Juni
o
C
Haman
o
Rever
t
b
r
eakage introduced b
y
c80522e30fd
c
190f8c8c7fc983bbe0
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
J
u
nio C
Hamano
Plug di
f
f lea
k
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Jun
i
o C Hamano
A
v
oid was
t
ing memory wh
i
le k
e
eping trac
k
of what we
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Be more backward com
p
at
i
ble with git-ssh-{push,pull}
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
J
unio C
Hamano
Un
o
pt
i
mize in
f
o/refs c
r
eation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hama
n
o
R
etire
i
nfo/r
e
v-cache
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
git
-
bran
c
h -d <branch>:
delete unused
b
ra
n
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
J
u
nio
C
Hamano
Revert
"[PATCH] plug m
e
mory leak in diff
.
c::dif
f
_
free_fi
l
epa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Ham
a
n
o
Make me
r
ge comment
g
it-pull makes for an
o
ctopus a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Jun
i
o C Hamano
M
erge bra
n
ch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
r
ead-tre
e
: fix bogus debug
g
ing statemen
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
J
unio
C
Hama
n
o
git-me
r
g
e-recu
r
sive
:
Tr
i
vi
a
l RE
fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PATCH]
Define relative
.
git/objects/info/altern
a
t
es
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C H
a
man
o
Detec
t
ls-remote fai
l
ure pr
o
perly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Ham
a
n
o
Fix
o
ff
-
by-one
e
rror in
g
it-merg
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C
Hamano
P
r
opagate e
r
rors
f
rom f
e
tch-pa
c
k correctly t
o
git-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
a
no
Fix CDPATH problem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C
Hamano
Merge branc
h
'ma
s
t
er' of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
Documen
t
git-grep
a
nd l
i
nk
i
t from
the main
git(7)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C Hamano
[PA
T
CH] Make
'
git che
c
kout' a bit more forgivin
g
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C
H
amano
[PATCH] Omit patches th
a
t have already
been mer
g
e
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Juni
o
C H
a
man
o
Allow finding things th
a
t begin
with
a
dash in 'git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Ju
n
io C Hamano
Merge br
a
n
c
h 'master
'
of
.
commit
|
commitdiff
|
tree
2005-09-12
J
u
nio C Hamano
Use int ins
t
ead of
so
c
klen_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Prepar
e
0
.
99
.
7 r
e
lea
s
e candidate
b
ranch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hamano
Add a new
m
erge s
t
ra
t
egy
by Fredrik Kuivinen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
'git-merge': Docum
e
ntation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Use Daniel's read-tree
in
the merge stra
t
egy 'res
o
l
v
e'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C H
a
mano
Multi-backend merge d
r
iver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
H
aman
o
Plu
g
leak i
n
Dan
i
e
l
'
s read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[PAT
C
H]
Add debug
g
ing he
l
p fo
r
case
#
1
6
to
r
ead-tre
e
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
i
o
C
Ham
a
no
[PA
T
C
H] Disable
d
ebugging from
r
ead-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Hamano
Fix 'git-sh
o
w-
b
ranch
--list <hea
d
>'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C
H
a
mano
Ad
d
'git bisect replay/
l
o
g
'
documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Keep bisection
log so tha
t
it can be replayed later
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hama
n
o
Fix copy
marking from diffcore-ren
a
me
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hama
n
o
Make su
r
e
we have lead
i
ng direct
o
ries under
r
efs/{
h
eads
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
J
u
nio C Hamano
show
-
b
ranch
:
-
-
list and --independent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Juni
o
C
Hamano
Retire supp
o
rt for old environment va
r
iables
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C H
a
mano
Adjust
.
gitig
n
ore for big rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Ign
o
re datestamp-on
l
y changes when
installi
n
g we
b
d
o
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C Hamano
Sque
l
ch `r
e
mov
a
l' messa
g
e from 'git reset --hard'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
J
u
nio C
Hamano
'
build'
scripts b
e
fore installing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Haman
o
Show
a
l
l
m
erg
e
-
base candidates from show-branch --
m
er
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio C H
a
mano
Doc
u
mentation upd
a
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C
Ham
a
n
o
g
i
t -
-
vers
i
o
n
tel
l
s
w
hich ve
r
sion
of git y
o
u have
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
Big tool re
n
a
m
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
J
unio C Ha
m
ano
GIT 0
.
9
9
.
6
commit
|
commitdiff
|
tree
2005-09-07
Ju
n
io C Hamano
Documentati
o
n updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Ham
a
n
o
Do
c
umentation
u
pdat
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-07
Junio C
Ha
m
ano
Flatten tool
s
/ directory to ma
k
e
build procedure simpler
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hamano
mailin
f
o
:
bar
f
and exi
s
t upo
n
nested mu
l
tipart
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-06
Ju
n
io C Hama
n
o
Merge
branch '
m
ast
e
r' o
f
.
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hamano
Format f
i
x
for asciido
c
docume
n
tatio
n
titles
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Merge b
r
anch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Reti
r
e git-clone-du
m
b-http
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Ins
t
all arc
h
imp
o
rt-sc
r
ipt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Junio
C Hama
n
o
Merge branch 'maste
r
' of
.
commit
|
commitdiff
|
tree
2005-09-04
J
u
nio C
Hamano
Ad
d
co
p
y
/renam
e
chec
k
fo
r
g
it-app
l
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hamano
Add a link from update-serve
r
-in
f
o documentation to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-04
Junio C H
a
m
a
n
o
g
it-
a
p
plymbox: fix '-c'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-03
Junio C Ham
a
n
o
Document hoo
k
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
J
uni
o
C Hamano
M
e
rg
e
br
a
nch 'master
'
of
.
commit
|
commitdiff
|
tree
2005-09-02
J
unio C Hamano
Mention p
o
st-update
when we first
ta
l
k about publish
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Hamano
scri
p
ts: e
q
uali
t
y test '
=
=' is not portable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Juni
o
C Hamano
git-chec
k
ou
t
-scri
p
t:
Remove unnec
e
ss
a
ry v
a
r
i
a
ble
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-02
Ju
n
io C
H
amano
Fix automerg
e
me
s
sag
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-01
Junio
C
Hamano
A
d
d repository-layout document
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-01
Junio C Hamano
Merge refs/heads/ma
s
ter from
.
commit
|
commitdiff
|
tree
next