repo.or.cz
/
alt-git.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 Hamano
Gi
v
e def
a
ult merge message after fai
l
ed automerge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Do not require clean tree when reverting and
c
h
e
rry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hamano
Fix o
v
erzealous cleanliness check in git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git-clone: check
out "master" by default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Junio C Ha
m
ano
Plug a small
r
ace in update-re
f
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C
Hamano
Diff: --
n
ame-status outpu
t
forma
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff: -l<nu
m
> to limit
r
e
name/copy d
e
tect
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
H
a
mano
Diff
c
lean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Merge branch 'fi
x
e
s
'
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ham
a
no
Cle
a
n generated files a bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
io C
H
amano
Stop
i
n
s
t
all
i
ng the backward compatible symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
Hamano
show-branch: fix commit naming
breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
git-grep: fix 'git
g
rep -
e
$
p
attern
'
han
d
ling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o
C
Ha
m
a
no
R
e
mo
v
e use of 'xargs -0
'
fro
m
git-reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ha
m
ano
U
s
e 0
.
99
.
7
.
G
I
T as versi
o
n
b
etween 0
.
99
.
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
Solari
s
: give a bit
mo
r
e built-
i
n defaul
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
mano
Reall
y
ignore generated
d
istribution
material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
ma
n
o
daemo
n
.
c: pid_t is not int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Juni
o
C Haman
o
Mer
g
e
'
fixes' branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Further c
l
arify licen
s
ing status of c
o
mpat/subprocess
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Ignore a bit more generated fil
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C
Ha
m
ano
Merge branc
h
'fixes
'
commit
|
commitdiff
|
tree
2005-09-23
Junio
C H
a
ma
n
o
Ma
k
e 'git di
f
f --ca
c
hed' s
y
n
onymous to
'
git
diff -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C H
a
m
a
no
D
o
not g
i
v
e
a
l
armin
g
error
m
essage
f
rom
r
sy
n
c in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ju
n
io C Hamano
Prettyprint octop
u
s merg
e
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C
H
a
m
ano
Retire di
f
f-help
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io C
Hamano
Retire
r
ev-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C H
a
mano
Retire gi
t
-export
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Re
v
e
rt "Use git-
m
erge inst
e
ad of git-resolve
in gi
t
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C Ham
a
no
R
e
vert "Make Octopus merge message a bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
H
amano
Merge branch
'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Fix docu
m
entati
o
n
dependency
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hama
n
o
Make object creation
i
n
htt
p
fet
c
h a bit safer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Clarify dual lic
e
nse status of subproce
s
s
.
py fi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Hamano
Updat
e
tuto
r
ial with
Octop
u
s u
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Hamano
Make
Octop
u
s merge message a bit n
i
cer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
unio C Hamano
Use git-
m
erg
e
i
n
stead of g
i
t-resolve in g
i
t
-
pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Do not give alarming
e
rror message from
rsync in fe
t
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
Hamano
Show modi
f
ied files in g
i
t-ls-
f
iles
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
F
a
st-path
'
upd
a
te-index --refresh' a bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
i
o C
H
ama
n
o
Use GECOS fiel
d
a
b
it better to produce default h
u
man
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Jun
i
o
C
Hamano
Document -i fl
a
g to
g
i
t-read-t
r
ee
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Hamano
Ship our o
w
n
copy of subpr
o
c
e
ss
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
s
ho
w
-branch: Be nicer wh
e
n running
in a corrupt r
e
pository
.
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
J
unio C
H
a
m
a
n
o
Arrgh -- another asciid
o
c caret workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Document extended SHA1 used by
git-rev-pars
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
Hamano
fetch() as
s
umes we do not have the objec
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
io C Hamano
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
Hama
n
o
I
m
prove the safety check used in fe
t
ch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o
C Hama
n
o
Arch
i
ve-destroying "gi
t
r
e
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 a
f
ter callin
g
bisect_auto_next()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Jun
i
o C Ha
m
ano
Fix typo i
n
tes
t
comment
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
u
ni
o
C Ham
a
no
[PAT
C
H] ge
t
domainname should
be usable on SunOS with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
unio C Hamano
Add git-send-e
m
ail to
.
g
i
ti
g
nore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
H
amano
Teach rsync tran
s
port abou
t
a
lternate
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Ju
n
io C
H
amano
[PATCH] fetch
.
c:
c
leanups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Jun
i
o C Ham
a
no
[PA
T
CH] Make git-checkout
failur
e
message more
f
riendl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Juni
o
C Hama
n
o
Recommend
'
l
ess'
for Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C
H
amano
Revert breakage introduced b
y
c80522
e
30f
d
c190f8c8c7fc98
3
bbe0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
H
amano
Pl
u
g diff leaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
unio C Hamano
Avoid wasting memory while keeping track of what we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Juni
o
C Hamano
B
e
more back
w
a
r
d
c
ompat
i
ble with git-
s
sh-
{
push,pul
l
}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Ham
a
no
Unoptim
i
ze
info/r
e
fs
c
re
a
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Juni
o
C
H
amano
Re
t
ire i
n
fo/rev-cache
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hama
n
o
g
i
t
-
b
r
a
n
ch -d <branch>: de
l
e
te un
u
sed bran
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
J
unio
C
H
amano
Revert "[
P
ATCH] plug memory
l
e
ak in d
i
ff
.
c::diff_fre
e
_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Haman
o
Make merge comment git-pull makes for
a
n
octopus a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Merge branch 'ma
s
ter' of
.
commit
|
commitdiff
|
tree
2005-09-14
Juni
o
C Hamano
read
-
t
r
e
e:
f
ix
b
ogus debugging s
t
at
e
m
e
nt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
J
u
n
i
o
C
H
amano
git-merge-recursive
:
T
ri
v
ial
R
E fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
a
m
ano
[PATCH] Define relative
.
git/objects/in
f
o/a
l
ternates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C Hama
n
o
D
e
tect ls-
r
emote fa
i
lure pro
p
e
rly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Hama
n
o
Fix off-by-one
error in git
-
m
erge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
P
r
opagate errors fro
m
fetch-pack co
r
rectly to
g
it-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C
Hamano
Fix C
D
PATH p
r
oblem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C Hamano
M
e
r
g
e
branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hama
n
o
D
o
c
um
e
nt git
-
gr
e
p and l
i
nk it f
r
o
m t
h
e main git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C
H
a
mano
[
P
ATCH] Make 'g
i
t
checkout
'
a bit m
o
r
e forgiving when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ham
a
no
[PA
T
CH] Omit patc
h
es that have alrea
d
y been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Ju
n
io
C
Hamano
Allow finding th
i
ngs tha
t
b
egin with
a
dash in
'git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Ju
n
io C Haman
o
M
e
rge b
r
anch 'm
a
s
ter' o
f
.
commit
|
commitdiff
|
tree
2005-09-12
Ju
n
io C Ha
m
an
o
Use
i
n
t i
n
s
tead of sockl
e
n_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio 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 Ham
a
no
Add a
n
e
w merge
strategy
b
y
Fr
e
drik Kuivinen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
io C Hamano
'git-merge': Doc
u
mentat
i
o
n
.
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 strategy 'r
e
solve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
ano
Multi-backen
d
merge
driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Pl
u
g leak in Daniel's r
e
ad-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Hamano
[PATCH]
Add debugging help for case #16 to read-tree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
io C Hamano
[PATCH] Disable debugging
f
rom
read-t
r
e
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C
Hamano
Fix 'git-show-branch --li
s
t
<
h
ead>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
u
ni
o
C Hamano
Add 'gi
t
bi
s
ect replay/log' doc
u
m
en
t
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
K
eep bisection l
o
g so
that
i
t
c
an
b
e
repl
a
ye
d
l
a
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Haman
o
Fix c
o
py marking from diffcore
-
rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Make sur
e
we h
a
ve leading dire
c
t
o
ries under refs/{he
a
ds
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C
Hamano
show-bra
n
ch: --list
and --in
d
epe
n
d
ent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C Hamano
Re
t
ire support
fo
r
old environme
n
t va
r
iables
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io
C
Hamano
Adjust
.
g
i
t
i
gnore for bi
g
rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
Hamano
I
gnore dat
e
stamp-o
n
ly c
h
anges when in
s
t
alling webdoc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next