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
Give default merge message after failed automerge.
2005-09-27
Junio C Ha
m
a
no
Give default merge me
s
s
a
ge
a
f
ter failed
automerge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
Do not requ
i
re clean tree when reverting and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C Hamano
Fix overzealous cle
a
nliness c
h
ec
k
in gi
t
-
m
erge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C H
a
mano
git-clone: check out
"
master"
by default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Junio C Hamano
Plug a small
r
ace in update-r
e
f
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
H
amano
Di
f
f: --n
a
me-s
t
atu
s
output format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o C
Hama
n
o
Diff
:
-l<num> to limit r
e
nam
e
/copy detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ha
m
ano
Diff clea
n
-u
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
io C Ham
a
no
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Hamano
C
l
ean generated file
s
a bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C Hamano
S
t
op install
i
ng the backward co
m
patible s
y
mlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Ha
m
ano
show
-
branch: fix commit namin
g
b
rea
k
a
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hama
n
o
git-g
r
ep: fix
'
git gr
e
p -e $patt
e
rn' hand
l
i
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ham
a
no
Remove
us
e
o
f
'xargs
-
0' from git-r
e
set
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
U
s
e 0
.
99
.
7
.
GIT as version between 0
.
9
9
.
7 and 0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C Hamano
S
o
laris: gi
v
e
a
bit mor
e
built-in d
e
faults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C Hamano
Really ignore gene
r
ated d
i
stri
b
ution material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Haman
o
daemon
.
c: pid_
t
is n
o
t int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hama
n
o
Merge
'fixes' branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Further c
l
arify licensi
n
g st
a
t
u
s
of compat/
s
ubprocess
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hama
n
o
Ignor
e
a bit mo
r
e genera
t
ed fi
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C Hamano
Merge branch 'fix
e
s'
commit
|
commitdiff
|
tree
2005-09-23
Junio C
H
ama
n
o
Make 'git diff --
c
ach
e
d' synonymous to
'
git diff
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ju
n
i
o
C Haman
o
Do not give alarming error mes
s
age from rsync in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ju
n
io C
H
ama
n
o
Prettyprint octopus merge mes
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io C Hamano
Retire
diff-helper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire rev-
t
ree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hama
n
o
Retire
git
-
export
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert
"
Use git-merge instead
of git-resolve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "Make Octop
u
s merge m
e
ssage a b
i
t nice
r
.
"
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
i
o
C
Haman
o
M
erge
branch
'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C
Hamano
Fix
d
o
cumen
t
ation de
p
endenc
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Make objec
t
c
r
e
ati
o
n i
n
http
f
e
t
ch
a bit safer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Clari
f
y dual license s
t
at
u
s
o
f subproce
s
s
.
py file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Hamano
Update tutor
i
al with O
c
topu
s
u
sage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Haman
o
Make Octopus m
e
r
g
e
mess
a
ge a bi
t
nicer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
mano
Use git-merge instead of git
-
resolve in gi
t
-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
n
io C Hama
n
o
Do not gi
v
e
a
l
arming error
message
f
rom r
s
yn
c
in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
ni
o
C
Hama
n
o
Show modified fil
e
s in git-ls-fi
l
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
Fa
s
t-
p
ath
'
upda
t
e-ind
e
x --re
f
resh'
a
bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io C Hama
n
o
Use
GECO
S
field a
bit better to produce defa
u
l
t
hum
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
ni
o
C
Haman
o
Docu
m
ent -i fl
a
g t
o
git-rea
d
-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Haman
o
Sh
i
p
our o
w
n copy of
s
ubproc
e
ss
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
show-bra
n
ch: Be nicer when running
in
a
corr
u
p
t
repos
i
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
A
rrgh -- anoth
e
r asciidoc caret workaroun
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o
C Hamano
Document ex
t
e
nded SHA1 used
by git-r
e
v-par
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
fe
t
c
h
(
)
ass
u
me
s
we do not have
t
he object
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Ham
a
no
Mer
g
e branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Improve th
e
s
a
f
e
ty check used in
f
etch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Hamano
Archive-destro
y
ing "
g
it r
e
pack -
a
-d" bu
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
Hamano
D
o
n
o
t fail after calling b
i
s
ect_auto_next()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hama
n
o
Fix typo
i
n
test
c
o
m
ment
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
u
n
io C
Hamano
[PATCH]
getd
o
mai
n
n
ame s
h
ould be usable
on SunOS with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
A
dd gi
t
-
s
e
n
d-em
a
il to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Juni
o
C Hamano
Teach r
s
ync tra
n
sp
o
rt about
a
lternate
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Ju
n
i
o
C
Hamano
[PATCH]
f
etch
.
c
:
cleanups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio
C Hamano
[PAT
C
H]
M
ak
e
gi
t
-
c
heckout fa
i
l
u
re message more f
r
iendly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
u
nio C
Haman
o
Recommend 'less' for Debi
a
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Juni
o
C Hamano
Revert breakage introd
u
ced
b
y c80522e30fdc190
f
8c8c7f
c
983b
b
e
0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
Hamano
Plug d
i
ff l
e
aks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
H
a
m
ano
Avoid wasting
m
emor
y
while keeping track of what we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Jun
i
o
C H
a
m
a
no
Be more b
a
ckwar
d
compatible wi
t
h
git-ssh-{push,pull}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
u
n
io C Hamano
Unoptimize i
n
fo/refs
c
reatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
Hama
n
o
Retire info
/
r
ev-
c
ache
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
unio C Hamano
git-branch -d <branch>:
delete
u
nu
s
ed branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C H
a
mano
Revert
"[PATCH]
p
l
ug memory leak in
d
iff
.
c::diff_free_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
J
unio
C
H
amano
M
a
ke me
r
ge comment git-pull makes for an o
c
topus a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Merge b
r
anch 'mas
t
e
r
' of
.
commit
|
commitdiff
|
tree
2005-09-14
Jun
i
o
C H
a
m
a
no
read-t
r
ee
:
fix bogus debugging statement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Ham
a
no
g
i
t-merge-recursive: Trivial RE fixe
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Hamano
[PATCH] Define relative
.
git/
o
bjects/in
f
o/alt
e
rnates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Detect ls-remo
t
e failure pro
p
er
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Fix off-
b
y-one error in
g
it-me
r
ge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
n
io C
H
a
m
ano
P
r
opagat
e
e
rrors from fetch-pack correctly to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
Fix CDPATH
problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hama
n
o
Merge
b
ranc
h
'master'
of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
ano
Doc
u
ment
git-g
r
ep
and
l
ink it from the main git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C
Hamano
[PATCH] Make 'gi
t
checkout' a bit more f
o
rg
i
ving w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hama
n
o
[PATCH] Omit pat
c
hes tha
t
have alr
e
a
dy been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C
Haman
o
A
l
low
f
inding things that begi
n
with a das
h
in 'git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Juni
o
C Hamano
M
e
r
ge bra
n
ch 'ma
s
ter' o
f
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C
H
amano
Use int instea
d
o
f socklen_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C Ha
m
a
n
o
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
A
dd a new merge strategy by
Fredrik Kuiv
i
nen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
H
amano
'
g
it-mer
g
e': Documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Use
Daniel's r
e
ad-tree
i
n t
h
e mer
g
e
strategy '
r
e
s
o
l
v
e
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Haman
o
Multi-backend m
e
rge drive
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
io C Hamano
Plug leak in Dan
i
e
l
'
s rea
d
-tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
Hamano
[
PATC
H
] Add debugging help fo
r
case #16 to read-tree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hamano
[
P
ATCH
]
Disable debu
g
ging from
r
ead-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
H
a
mano
Fix 'git
-
show-bra
n
c
h
-
-
list <head>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hama
n
o
Add
'git
bisect replay/log' docum
e
ntation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Ha
m
ano
Keep bisec
t
i
on l
o
g so that it c
a
n be replayed later
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio
C Hamano
Fix
c
opy
marking from diffcore-rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Mak
e
sure we have leadin
g
directories un
d
e
r
refs/{he
a
ds
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C Hamano
sho
w
-branch: --list and
-
-
independent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Retire
support for ol
d
e
n
vironme
n
t variables
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
A
djust
.
gitignor
e
fo
r
big r
e
name
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
u
n
io C Hamano
I
gnore datestamp-only changes when
installing w
e
bd
o
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next