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
Fix overzealous cleanliness check in git-merge
2005-09-27
Junio C Hamano
Fix ov
e
rzealo
u
s cle
a
nl
i
nes
s
check in gi
t
-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 Hamano
P
l
u
g
a smal
l
rac
e
in updat
e
-
r
ef
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Juni
o
C Ham
a
n
o
Diff:
-
-name-stat
u
s output
f
o
r
mat
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Juni
o
C Ham
a
no
Diff: -l<num>
t
o
l
imit rename/copy
d
e
tec
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C
Hamano
Diff c
l
ea
n
-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
n
i
o
C
Ha
m
ano
M
e
rge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ha
m
ano
Clean generated files a bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C
H
amano
Stop installing
the backward
compatibl
e
symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o
C Hamano
show-branch
:
f
i
x commi
t
naming breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
Hamano
git
-
grep: fix
'
git
grep -e $pattern' h
a
ndling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
R
emo
v
e
use of 'xargs -0' from git-reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
a
m
a
no
Use 0
.
99
.
7
.
GIT as version
b
etwee
n
0
.
99
.
7 and 0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
Ha
m
ano
Solaris: giv
e
a bit more built-in defaults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
m
a
no
Really i
g
nor
e
ge
n
e
r
ated distributi
o
n material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C Hama
n
o
daemon
.
c
:
p
id_t is not int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C Hamano
M
erge 'fixes' b
r
anch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
i
o
C
H
amano
Furth
e
r clarif
y
licensing status of
compat/sub
p
rocess
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Ignore a
b
it more generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
J
u
nio C H
a
mano
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Mak
e
'git diff --cac
h
ed
'
synonymous
to 'gi
t
dif
f
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Do not give
a
larming error m
e
ssage from rs
y
n
c in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Ju
n
io C H
a
mano
P
r
ettyprint octopus merge message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire diff-helper
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io C Hamano
Retire rev-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire g
i
t
-
e
xport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
ano
R
e
ve
r
t "Use git-merg
e
ins
t
ead o
f
gi
t
-
r
esolve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Hamano
Re
v
ert "Make
Oc
t
opus
merge
m
essage a b
i
t n
i
cer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
a
m
ano
Me
r
ge b
r
anch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Hamano
Fix
d
ocumentatio
n
dependency
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio
C
Ham
a
n
o
Ma
k
e obj
e
ct creation in
h
ttp fetch a bit safe
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C H
a
mano
C
larify
dual
l
icense status of sub
p
rocess
.
py file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Hamano
U
pdate
t
utorial with Octop
u
s usage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Haman
o
Ma
k
e Octopus
m
e
rge mess
a
ge a bit nicer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io
C Hamano
Use git-me
r
ge instead of git-re
s
olve in git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Jun
i
o C Ham
a
no
Do
n
ot give alarmin
g
e
r
r
or
m
essage from rsy
n
c in
f
etch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C H
a
mano
Sh
o
w
m
odified fi
l
es in
g
i
t-ls-files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
unio C Hamano
Fast-path 'up
d
ate-inde
x
--refresh'
a bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
nio C Hamano
U
se GECOS field a bit
be
t
ter to produce de
f
ault human
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Docume
n
t
-
i flag to
g
it-read
-
tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C H
a
mano
Ship our own c
o
py of subpr
o
cess
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Juni
o
C
Ha
m
ano
s
how-branch
:
Be ni
c
er when
r
u
nning in a
c
orrupt repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
GI
T
0
.
9
9
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hama
n
o
Arrgh -- a
n
other asc
i
ido
c
ca
r
et workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Docu
m
ent extend
e
d
SHA1
u
sed
b
y
gi
t
-rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hama
n
o
fet
c
h() ass
u
mes we
d
o n
o
t ha
v
e the objec
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Hamano
Me
r
ge branc
h
'
m
a
s
t
e
r
'
of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C
Hamano
Im
p
rov
e
the safety c
h
ec
k
used
in fetch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Ha
m
ano
Arc
h
iv
e
-destr
o
ying "git repa
c
k -a -d" bug
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Do not
f
ail af
t
er calling bisect_auto_next()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hama
n
o
Fix
t
ypo in test com
m
ent
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C H
a
mano
[PATCH
]
g
e
tdomainn
a
me should be usabl
e
on SunO
S
w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
Ha
m
ano
Add
git-send-email to
.
gitignor
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
unio C Hamano
Teach rsy
n
c transport a
b
ou
t
alternat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
u
ni
o
C
Hamano
[PATCH] fetch
.
c: cle
a
nups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
[PATCH] Make
git-checkout failure
m
e
s
sage more friend
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Juni
o
C Hamano
Recommend 'less' for Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio
C
H
a
m
ano
Revert breaka
g
e
i
n
tro
d
uced
b
y c80522e
3
0fdc190f8c
8
c7f
c
983bbe0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
Hamano
Plug
d
iff l
e
aks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io C Ha
m
a
n
o
Avoi
d
wasting memory w
h
ile ke
e
ping tra
c
k of wha
t
we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Be more ba
c
kward compat
i
b
l
e
w
it
h
git-ssh-{push
,
p
u
ll}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C H
a
ma
n
o
Unoptimize info
/
refs cre
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio 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 <br
a
nch>: del
e
te
u
nu
s
ed branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C Ha
m
ano
Revert
"[P
A
TCH] pl
u
g memory l
e
a
k
in diff
.
c::dif
f
_fr
e
e_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
J
u
nio C H
a
mano
Ma
k
e mer
g
e c
o
mment git-pull makes for an octopus
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Haman
o
M
erge bra
n
ch 'mas
t
er' of
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
rea
d
-t
r
ee: fix bogus de
b
ug
g
ing sta
t
ement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C
Ha
m
a
no
git-merge-re
c
urs
i
v
e:
T
ri
v
ial RE fi
x
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Hamano
[
PATCH
]
Define relative
.
git/obj
e
ct
s
/info/altern
a
t
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio
C Hamano
Dete
c
t ls-remot
e
failure properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
un
i
o C Hamano
Fix off-by-one err
o
r in git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C Hamano
Propaga
t
e errors from fetch-
p
a
c
k correctly to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
ama
n
o
Fix CDPATH problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Ham
a
n
o
Merge
branch
'master' of
.
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hamano
Document
g
it-grep and link it from th
e
mai
n
git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio
C Hamano
[P
A
TCH
]
Make 'git
c
h
e
ckout' a
b
i
t
more forg
i
v
ing when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
un
i
o C Haman
o
[PATCH] O
m
it patches that have
a
l
r
ea
d
y been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Ha
m
ano
Allow finding things that begin w
i
th
a dash in 'gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C H
a
mano
Merge branch 'm
a
ster' of
.
commit
|
commitdiff
|
tree
2005-09-12
Junio
C Hamano
Use
i
nt instead of
s
o
cklen_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 cand
i
date br
a
nc
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Hamano
Add a new merge strategy by Fredrik
K
uivinen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C
H
amano
'git-merge': Documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o
C Hamano
U
se D
a
nie
l
's read-tree in the merge strategy 'resolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hama
n
o
Multi-backe
n
d
merg
e
driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
ano
Plug leak in Daniel's read-tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C
Ham
a
no
[PAT
C
H] Add debugging help f
o
r case #16 to re
a
d-tree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C Hamano
[PATCH] D
i
sable debugg
i
ng from
rea
d
-tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hama
n
o
Fix 'git-s
h
o
w
-bra
n
ch --lis
t
<head>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hamano
Add 'g
i
t b
i
sect replay/l
o
g' d
o
cumentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Juni
o
C H
a
mano
K
eep
b
isection log so that it
can be replayed later
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Juni
o
C Haman
o
Fix copy marking from diffcore
-
rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
u
nio C Hamano
Make sure we h
a
v
e
leading di
r
ectories u
n
der
refs/{heads
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hama
n
o
sho
w
-b
r
anch: --list a
n
d --independent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o
C Haman
o
R
e
tire
s
up
p
ort for old env
i
ronment variable
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
u
n
io C Hamano
Adjust
.
gitignore for big r
e
name
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Igno
r
e
datesta
m
p-only changes when in
s
talli
n
g webdoc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio
C H
a
ma
n
o
S
q
uel
c
h `removal' message fr
o
m 'git reset --hard'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
unio C Hama
n
o
'
build' s
c
r
i
pts be
f
o
r
e insta
l
ling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next