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
Make Octopus merge message a bit nicer.
2005-09-21
J
unio C Ha
m
ano
Make Octop
u
s
merge messag
e
a bit n
i
c
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
u
n
io C Haman
o
Use git
-
merg
e
instead of git-
r
e
solve in g
i
t-pul
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Do not give alarming error messag
e
f
rom
rsync in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Show modified fi
l
es in g
i
t-ls-files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Juni
o
C
Hamano
Fas
t
-
p
a
t
h 'updat
e
-in
d
ex --refre
s
h' a b
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
U
s
e G
E
C
O
S field a bit
b
etter to produ
c
e d
e
fault hum
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Haman
o
Document -i flag to git-read-tr
e
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Haman
o
Ship our o
w
n
copy of subprocess
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
show-bran
c
h: Be nic
e
r
when run
n
i
n
g
in a
c
orru
p
t
repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C H
a
m
a
n
o
GIT 0
.
9
9
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
A
r
rgh
-
-
another asci
i
d
o
c caret workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C
Hamano
D
o
cument exte
n
ded
S
HA
1
us
e
d by
g
i
t
-re
v
-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Juni
o
C
H
amano
fetc
h
() ass
u
m
e
s
we
do
n
ot have the
o
bje
c
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
H
amano
Merge bra
n
ch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Improve the safety check used in fetch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
A
r
chive-destroying "git re
p
ack -
a
-
d"
bug
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Do
n
ot fail afte
r
ca
l
ling bisect
_
auto_
n
ext()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C H
a
m
ano
Fix
t
y
p
o in test comment
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
[PATCH] get
d
omainnam
e
should be usable on SunOS with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Add gi
t
-send-
e
m
ail to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Teac
h
rsync transport about alternates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
[PATCH] fetch
.
c: cleanups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C
Hamano
[P
A
TCH] Make g
i
t-checkout
f
a
i
lure
m
ess
a
ge
m
o
r
e friend
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Ju
n
i
o C Hamano
Rec
o
mmend 'less'
for De
b
i
an
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Juni
o
C Hama
n
o
Revert br
e
ak
a
ge introduced b
y
c80522e3
0
fdc190f8c8c7fc98
3
b
b
e0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Plug
diff leaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
u
n
io C Ham
a
no
Avoid wasting
m
emory while keeping track
of w
h
at we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Juni
o
C Ham
a
n
o
Be mo
r
e
b
ack
w
ard compatible wit
h
gi
t
-ssh-{pu
s
h,pull}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Jun
i
o C Hamano
Unoptimi
z
e
i
n
f
o/refs creati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io C
Hamano
Re
t
i
r
e
inf
o
/rev-cache
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
git-branch -d
<
b
r
anch>: del
e
t
e
u
n
used branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Revert "[PATCH]
plug memory leak
i
n
d
if
f
.
c::diff_free_f
i
lep
a
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hama
n
o
Make merge comment git-pull makes for an octop
u
s a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C Hamano
Merge branch
'
m
as
t
er' of
.
commit
|
commitdiff
|
tree
2005-09-14
Junio
C Hamano
r
e
a
d-tree: fix bogu
s
debugging st
a
teme
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Ju
n
io C Haman
o
git-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
a
mano
[PAT
C
H] De
f
ine relative
.
gi
t
/objects/info/
a
lternates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hamano
Detect ls-remote fa
i
lure properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Fix off-by-one error i
n
git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio
C
Ham
a
no
P
r
opa
g
ate errors fr
o
m fet
c
h
-
pack co
r
rectly to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C Hamano
F
ix CDPATH problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
ano
Merge bra
n
c
h
'ma
s
t
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio
C Hama
n
o
D
o
cument
g
i
t-grep and link it from th
e
main git
(
7
)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C Hamano
[PATCH] Make
'
git che
c
kout' a bit
more for
g
ivin
g
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hamano
[PATCH
]
Omit pat
c
he
s
t
hat
h
a
v
e
alread
y
bee
n
m
e
r
g
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio
C
Ha
m
ano
Allow f
i
nding
t
hings that begin
w
ith
a dash in 'git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hama
n
o
Merge branch
'master'
o
f
.
commit
|
commitdiff
|
tree
2005-09-12
Junio
C
Hama
n
o
Use int
i
nst
e
a
d of
sock
l
en_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
Hama
n
o
Prep
a
re 0
.
9
9
.
7 re
l
ease candidate
b
ranch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
Hamano
Add a
n
ew merge strategy by Fredrik Kuivinen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C
H
amano
'git-merge': Do
c
umentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
Hamano
Use
D
ani
e
l'
s
r
e
ad-tree in the
m
erge st
r
ategy 're
s
o
l
ve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Hamano
Multi-backe
n
d mer
g
e driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Plug le
a
k in
D
anie
l
'
s
r
ead
-
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[PATCH] Add debuggi
n
g help f
o
r
cas
e
#16 to re
a
d-tree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o C
H
a
m
ano
[PATCH] Disable
debugg
i
ng
f
r
om
r
ea
d
-t
r
ee
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio
C
Hamano
Fix 'git
-
show-
b
ranch --l
i
s
t
<head>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
u
nio C Hamano
Ad
d
'
git bisect replay/log
'
document
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Juni
o
C Hamano
K
eep bisection log
so that it ca
n
be replayed later
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Ju
n
io C Ham
a
no
Fix copy marking from diffcore-rena
m
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Ham
a
no
Make sure
we have
l
e
ad
i
ng directories und
e
r ref
s
/{
h
ea
d
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C H
a
mano
show-branch: --li
s
t and --independent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C Hamano
Retire su
p
port for ol
d
environm
e
n
t v
a
r
iables
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C Hamano
Adjust
.
giti
g
nore for big r
e
name
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Ignore datestamp-only ch
a
ng
e
s
when
i
n
stalling
webdoc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Ham
a
no
Squelch `removal' messa
g
e from
'
git reset -
-
ha
r
d'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
H
amano
'bu
i
ld' scripts before i
n
s
talling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Ju
n
io C Hamano
S
h
o
w
all merg
e
-ba
s
e candidates from
show-branch
-
-merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C
Hamano
D
o
cumentation
updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Jun
i
o C Ha
m
ano
git --versi
o
n tells w
h
ich version
o
f git you
h
a
ve
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
Big tool
rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C H
a
m
ano
G
IT 0
.
9
9
.
6
commit
|
commitdiff
|
tree
2005-09-07
Ju
n
i
o C
Hamano
Docum
e
ntation up
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C H
a
mano
Documenta
t
ion updat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Flatten tools/ directory to m
a
ke build procedure simp
l
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Hamano
maili
n
fo: barf and e
x
i
st upon
n
e
sted multipart
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Ju
n
io C Ha
m
an
o
M
e
rge branch '
m
aster' of
.
commit
|
commitdiff
|
tree
2005-09-06
Ju
n
io C H
a
mano
Format
f
ix for asciidoc documentation
titles
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Junio
C Hamano
Mer
g
e branch 'master
'
of
.
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Retire git-clone-dumb-http
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Junio C
Hamano
I
nstall ar
c
hi
m
p
o
r
t
-
script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Ha
m
ano
Merge branch 'master'
of
.
commit
|
commitdiff
|
tree
2005-09-04
Ju
n
i
o
C
Hamano
Add cop
y
/rename 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
f
rom update-se
r
v
e
r-info documentation to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
J
unio C Hamano
g
i
t-applymbox: fi
x
'-c'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-03
Ju
n
io C Hamano
D
o
cument hooks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Hamano
Merge
b
ranch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-02
Juni
o
C Ha
m
ano
Mention post-
u
p
d
a
te when we first talk abo
u
t pu
b
lishin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Jun
i
o
C Hama
n
o
scrip
t
s: equal
i
ty test '==' is n
o
t po
r
table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
J
u
nio C
H
amano
git-checkout-script: Remove unnecessary
v
ar
i
a
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Hamano
Fix autom
e
r
g
e message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C Hamano
Add re
p
o
sitory-
l
a
y
out document
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio
C
Ha
m
ano
Merge refs/heads/
m
ast
e
r from
.
commit
|
commitdiff
|
tree
2005-09-01
J
u
nio C Hamano
Use
'git
st
a
tus' now it
c
an h
a
ndle initial c
o
mmit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
J
u
nio C Hamano
F
i
x git-stat
u
s when HEAD is invalid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C Hamano
F
ix git-log
-
script when HEAD is inv
a
lid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
J
u
n
i
o C Hamano
Add Pine 4
.
6
3
help f
r
om
D
aniel
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
J
u
n
i
o
C Hamano
Merge ref
s
/heads/mast
e
r from
.
commit
|
commitdiff
|
tree
2005-08-31
Junio C Haman
o
Update tutorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio
C Hamano
show-branch:
make it work in
a
subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next