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
Jun
i
o C
H
amano
G
iv
e
default merge messag
e
afte
r
failed automerge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o C Hamano
D
o not require cl
e
an tree
w
h
e
n
r
e
v
er
t
i
ng an
d
cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o
C
H
a
mano
Fix
o
v
e
rzealous cl
e
a
nl
i
ness check in git-
m
erg
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
Hamano
git-clone:
check
o
u
t
"
master" by d
e
fault
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Junio
C Hamano
Plug a
small race in upda
t
e-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ha
m
an
o
Diff: --name-
s
t
a
t
u
s
outp
u
t
f
ormat
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
H
a
m
a
no
Diff: -l<num>
t
o
limit re
n
ame/copy detect
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o C Hamano
Diff clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ha
m
ano
Merge
b
ranch 'f
i
xes'
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o
C Ham
a
no
Clean g
e
nerated fil
e
s a b
i
t
more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C Ham
a
no
S
t
op insta
l
lin
g
the b
a
ckward
c
om
p
atib
l
e
s
ymlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C
Hamano
show-bran
c
h: f
i
x commi
t
na
m
i
ng breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
i
o C Hamano
g
it-grep: fix
'git grep -e $pattern' handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
n
io C Hamano
Remove use
o
f 'x
a
r
g
s -0' f
r
om
g
i
t-res
e
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Use 0
.
99
.
7
.
G
IT as ver
s
ion between
0
.
99
.
7 an
d
0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Sol
a
ris: gi
v
e a bit more built-in def
a
ults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
Hamano
Re
a
lly ign
o
re
gen
e
rated di
s
tr
i
but
i
on
m
a
terial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C Hamano
daem
o
n
.
c
:
pid_t
i
s not int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Merge 'fixes' branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o
C Hamano
F
urthe
r
clarify licensing statu
s
of co
m
pat/subpro
c
e
s
s
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Ign
o
r
e
a
b
it more
g
enerated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Merge bra
n
c
h
'
fixes'
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Make 'git diff --ca
c
hed' synonymous to 'git diff -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C
Hamano
Do n
o
t give ala
r
ming erro
r
message from
r
s
ync in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Ha
m
ano
P
r
ettypri
n
t
octop
u
s merge message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
J
u
n
io C Hamano
Ret
i
re diff-helper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Jun
i
o
C
Hamano
Retire rev-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io C Hamano
Retir
e
git-export
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
a
m
ano
Revert
"
Use git-merge inst
e
ad
o
f
g
i
t
-
r
esolve in
g
it
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o
C
Hamano
Revert
"Make Octo
p
us merge mess
a
ge a bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Hamano
Merge bran
c
h
'
fixes'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
a
no
Fix d
o
cum
e
n
t
a
ti
o
n dependency
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
aman
o
M
a
ke obj
e
ct cre
a
tion
i
n http fetch a bit safe
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ham
a
no
Clarify dual lic
e
nse st
a
tus
o
f subpro
c
ess
.
py file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Up
d
a
te tutorial wit
h
Octopus usage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Ha
m
a
n
o
Make Octopus merge me
s
sage a bit nicer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Use git
-
merge instead of
g
it
-
r
es
o
lve in
g
it-
p
ull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C H
a
mano
Do
not give a
l
arming error message
f
r
o
m rsync in
f
e
t
ch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
a
mano
Sh
o
w m
o
dified files in
g
it-l
s
-
fi
l
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Jun
i
o C Hamano
Fast-path 'update-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 b
e
tter to produce defau
l
t
hum
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Hamano
D
o
cu
m
ent
-i flag to g
i
t-read-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
Ship our own
co
p
y
of subp
r
o
cess
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
show-bran
c
h:
B
e nicer whe
n
running
i
n a corrupt r
e
pository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
unio C Hamano
GIT 0
.
9
9
.
7
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio
C
Hamano
Arrgh --
anothe
r
asciido
c
caret
workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C Hamano
D
ocument ex
t
ended SH
A
1 used
b
y g
i
t
-
rev-p
a
rse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Juni
o
C
Hamano
f
e
tc
h
() assumes we do not have
t
he o
b
ject
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C
H
a
m
ano
Merge branch 'master
'
of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Impro
v
e the
saf
e
ty check use
d
in fetch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Archive-des
t
roying
"git repack
-a -d" bug
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
u
ni
o
C Ham
a
n
o
Do not
fai
l
a
fter ca
l
ling b
i
sect_auto_ne
x
t()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
unio C Hamano
Fix typo in test comm
e
nt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
[PATC
H
] getdom
a
inname should
be
usable
on SunO
S
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Add
g
it-send-
e
mail to
.
g
itignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Ham
a
no
Teach rs
y
nc transport about a
l
terna
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
[PATC
H
] fe
t
ch
.
c:
c
lean
u
ps
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Haman
o
[PATCH]
M
ake g
i
t-checkout
f
ailu
r
e message more
f
r
iendly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
unio C Hama
n
o
Recommend
'
less'
f
or Debia
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
u
nio C Ha
m
ano
Revert breakage introduc
e
d by c8
0
52
2
e30fdc190
f
8c8c
7
fc98
3
bbe0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
P
l
ug diff leaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C H
a
mano
A
void wasting me
m
o
r
y
whil
e
k
eeping track of what w
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C H
a
mano
Be more bac
k
ward com
p
atible with git-ssh-{push,pull}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io C
H
a
mano
Unoptimize info/refs creati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io
C
Hamano
Reti
r
e info/rev-ca
c
he
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
Hamano
git-branch -d <branch>: delete unused
br
a
nch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C
Haman
o
Re
v
e
r
t
"
[PATCH] plug
memory leak in diff
.
c::d
i
ff_fre
e
_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Make m
e
rge comment git-pul
l
ma
k
es for
a
n octopus a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C
Hama
n
o
Merge bran
c
h 'maste
r
' o
f
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Ham
a
no
read-t
r
ee: fix
b
o
g
us
d
eb
u
gging statement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
git-merge-recurs
i
ve: T
r
ivial R
E
fix
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
an
o
[
P
ATCH]
D
efine
relative
.
git/objects/info/
a
ltern
a
t
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hamano
Detect ls-remote f
a
ilure
properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Hamano
Fix
off-by
-
one erro
r
i
n git
-
m
erge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio
C
Hamano
Propagate errors f
r
om f
e
tch-
p
ack
c
orre
c
tly to git
-
f
e
tc
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C H
a
mano
Fix CDPATH problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
Merge
b
r
anch 'mast
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C H
a
man
o
Document git-grep and link
it from the main git(7
)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Haman
o
[PATCH] Make
'git
checko
u
t
'
a bi
t
more
f
orgiving
when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C
Hamano
[PATC
H
]
Omit patches that
h
ave already been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Allow finding things th
a
t
b
e
gin w
i
th
a dash i
n
'git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
J
u
nio C Ha
m
ano
Merge
branch 'maste
r
' of
.
commit
|
commitdiff
|
tree
2005-09-12
Jun
i
o
C
H
amano
Use int instead
of soc
k
len_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Prepa
r
e 0
.
99
.
7 rel
e
ase candidate branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C
H
amano
Add a new merge
s
trategy by Fred
r
ik Kuivin
e
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ham
a
no
'git-mer
g
e
': Docume
n
tatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o C Haman
o
Use D
a
niel
'
s
r
e
ad-tree in
the merge
s
t
rategy 'resolv
e
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Multi-backe
n
d merge
driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Plug leak in Daniel's read-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
for ca
s
e #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
A
T
C
H] Disa
b
le debuggi
n
g
from read-tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
io C Ham
a
no
Fix 'git-s
h
ow-b
r
anch --list <head>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hama
n
o
Ad
d
'
g
it bisect replay
/
log' documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Ha
m
an
o
Ke
e
p bisection log so that it can
b
e repl
a
yed later
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C
Hamano
Fix copy ma
r
kin
g
from diffcor
e
-rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
unio C Hamano
Make sure we have leading director
i
es und
e
r r
e
fs/{h
e
ads
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
H
am
a
no
show-bran
c
h: -
-
list and --independent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o C
H
amano
Retir
e
support for old environm
e
nt
v
a
r
iable
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C Haman
o
Ad
j
ust
.
gitignore for big r
e
nam
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
Hamano
Ignore
dat
e
st
a
m
p
-
o
n
l
y cha
n
ge
s
when installi
n
g webdoc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next