repo.or.cz
/
git
/
jrn.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
J
uni
o
C
H
a
mano
Giv
e
def
a
u
lt merge message after
f
ail
e
d autom
e
rge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hamano
Do not require cl
e
an tree when reverting a
n
d c
h
er
r
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Fix overzealous cleanliness check i
n
gi
t
-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
Haman
o
git-clone:
c
h
e
ck
o
ut "mast
e
r" by default
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-26
J
u
n
i
o
C
H
amano
P
l
ug
a
small race in update-ref
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o C Hamano
Diff: --nam
e
-status ou
t
put for
m
a
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Ham
a
no
Diff:
-l<num> to limit rena
m
e/
c
op
y
detection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
i
o
C Hamano
Diff
c
le
a
n-
u
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hamano
M
e
r
ge bra
n
ch 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio C
Hamano
C
l
e
an generated fi
l
es a bit more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio
C
Hamano
Stop
instal
l
ing
t
he
backwar
d
com
p
a
t
i
b
le syml
i
nks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
show-bran
c
h: fix commit naming brea
k
age
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ha
m
ano
git-gre
p
: fix 'gi
t
g
r
e
p
-e $pattern' hand
l
ing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
mano
Remove
u
se of
'
xargs -0' from git-reset
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio
C Hamano
Use 0
.
99
.
7
.
GIT a
s
versi
o
n betw
e
en 0
.
99
.
7
and 0
.
9
9
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
unio C Hamano
Solaris: give a bit more
b
uilt-in defaults
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
H
amano
Really ig
n
o
re gene
r
a
ted
d
istr
i
b
ution mate
r
ial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
daemon
.
c: pid_t is
not i
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Mer
g
e 'f
i
xes' branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
m
ano
Further clarif
y
licensin
g
status of compat/su
b
process
.
py
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C
H
amano
Ignore a bit mor
e
g
e
n
e
rated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C H
a
ma
n
o
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Make 'git
d
iff --c
a
ched'
s
yno
n
y
mous
t
o
'
g
i
t
d
iff
-
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Do not give alarming error mess
a
ge
f
rom r
s
ync
i
n fetc
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Ju
n
i
o C Hamano
Prettyprint octopus merge message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Reti
r
e diff-helper
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io
C Hamano
Reti
r
e rev-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Haman
o
Retir
e
git-ex
p
o
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Haman
o
Revert "Us
e
git-mer
g
e instead
of git-res
o
lve
in g
i
t
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Hama
n
o
Revert "
M
ake Oct
o
pus
m
erge message a bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
J
unio C
Hama
n
o
M
erge
branch 'fix
e
s'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Fix
d
ocumentat
i
on
d
epe
n
dency
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
ano
Ma
k
e obj
e
ct creatio
n
in
h
ttp
fetch a b
i
t safer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Clarify
d
ual license stat
u
s of sub
p
rocess
.
py
file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Update
t
u
torial with
O
ctopu
s
usa
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hama
n
o
Make Oc
t
opus merge messag
e
a bit n
i
cer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Use
g
it-mer
g
e instea
d
o
f
git-resolve in git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
D
o
not give alarm
i
n
g
e
rror messag
e
f
r
om rsync in fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Sho
w
modif
i
ed files in git-l
s
-fil
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Fast-pat
h
'updat
e
-index --refresh' a
bit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
unio C Hamano
Use GECOS field a bit bette
r
t
o
p
roduce default
human
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C Ha
m
ano
Document -i fla
g
to git
-
read-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Ship our ow
n
c
o
py of sub
p
r
o
cess
.
py
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
uni
o
C
Ha
m
a
n
o
show-b
r
a
nch: B
e
nicer
w
h
e
n ru
n
ning in a corrupt
repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Haman
o
GIT 0
.
9
9
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Arrg
h
-- a
n
other a
s
c
i
idoc c
a
ret workaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Doc
u
ment e
x
tended
S
H
A1 used by gi
t
-
r
ev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Hamano
fetch() assume
s
we
do not
have the object
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
J
u
n
i
o C Hamano
Merge bra
n
ch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-18
Juni
o
C Ha
m
ano
Improve t
h
e
safety
check us
e
d
i
n fetch
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
H
a
m
ano
Archive
-
destroying
"
gi
t
repack -a -d" bug
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Do n
o
t fail
a
fter
cal
l
ing bise
c
t_auto_n
e
xt()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
Hama
n
o
Fix typo in test comm
e
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
[PATCH] get
d
omainna
m
e should
b
e
usabl
e
on SunOS
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Jun
i
o C Hamano
Ad
d
g
i
t-sen
d
-emai
l
to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Teach
rsync transpor
t
about
alte
r
nates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
J
unio
C
Hamano
[PATCH] fet
c
h
.
c: cl
e
a
nups
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Ju
n
io C Ham
a
no
[PATCH] Make git-
c
hec
k
o
ut failure m
e
ssage mor
e
friendly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
R
e
commend
'
less' for Debian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio
C Hamano
Revert breakage
introduced
b
y c80522e30
f
dc
1
9
0
f8c8c7fc9
8
3bbe0
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
H
a
m
an
o
Plug d
i
ff
leak
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Ha
m
a
n
o
Avoi
d
wa
s
ting me
m
ory
w
hil
e
ke
e
ping track o
f
w
ha
t
we
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
J
u
n
io C Hamano
Be more
backwa
r
d compatible
w
ith
g
it-ssh-{push,pull}
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io C Hamano
Unoptimize info/refs
c
re
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
J
u
n
i
o
C Hamano
Retire info/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
te unused bra
n
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Ham
a
no
Revert
"[PATCH] plug memo
r
y leak in dif
f
.
c::d
i
ff_free_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hama
n
o
Make merge
comment
git-pull makes for an octopus a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
J
u
n
i
o
C Ham
a
n
o
Merge branch 'master'
o
f
.
commit
|
commitdiff
|
tree
2005-09-14
Junio
C Hamano
read-tree: fix
bogus debugging stat
e
ment
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C
Haman
o
git-
m
erge-recu
r
sive: 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/objec
t
s
/
inf
o
/al
t
ernates
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hama
n
o
De
t
ect ls-remote
failure properly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C Ham
a
no
F
i
x
o
ff-by-one error
i
n git-mer
g
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C H
a
m
ano
Propagate err
o
rs
from fetch-pack
correctly to git-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ham
a
n
o
Fi
x
CDPATH
problem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C
H
a
mano
Merge
b
ranch '
m
aster'
of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Haman
o
Document gi
t
-grep and link
i
t from the m
a
in g
i
t(7
)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C
Hamano
[
PAT
C
H
] Ma
k
e 'git check
o
ut' a
bit more forgivi
n
g when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C Hamano
[PATCH] Omit
patches that
h
ave a
l
re
a
d
y been m
e
rged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Jun
i
o C
H
aman
o
Allow finding thi
n
g
s that be
g
in 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
M
e
rge bran
c
h 'master' of
.
commit
|
commitdiff
|
tree
2005-09-12
Juni
o
C
Hamano
Use int instead of
socklen_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Pre
p
a
r
e 0
.
99
.
7 re
l
ease candid
a
te
b
r
anch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
Hamano
Add
a new
m
e
rg
e
strategy
b
y F
r
edrik Kuivinen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
n
i
o C Hamano
'git-merge': Document
a
tio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hama
n
o
U
se
D
an
i
el's rea
d
-tree in the merge
s
trategy 'r
e
solve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
M
ulti-backend
me
r
ge
d
ri
v
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
Ham
a
n
o
P
l
ug
leak in Daniel's read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o C
Hamano
[
PATCH]
A
d
d
debugging help for case #1
6
to
r
ead-tre
e
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
[PATCH]
Disabl
e
debugging
f
rom
rea
d
-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hamano
Fix '
g
it-show-branch --list <head>'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C
Hamano
Add 'git b
i
sect re
p
l
a
y/log' docum
e
ntation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
J
u
nio C
H
amano
K
e
ep bisection lo
g
so
that
i
t
can be replayed lat
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Juni
o
C Hamano
Fi
x
copy markin
g
from diff
c
o
r
e-renam
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Juni
o
C Ha
m
a
no
Make sure w
e
ha
v
e le
a
din
g
direct
o
ries
u
nd
e
r refs/{heads
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Ha
m
a
n
o
show-bran
c
h: --list
a
nd --independent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C
H
amano
R
etire support
f
or
ol
d
envir
o
nm
e
nt variables
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C
H
a
ma
n
o
Adjust
.
giti
g
nore
for big r
e
name
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
i
o
C Ham
a
n
o
Ign
o
re datestamp-only chan
g
es whe
n
installing webdoc
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next