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 default pull not to do an unintended Octopus.
2005-09-28
Junio C
Hamano
Fix de
f
ault
p
ull not to do
a
n unintended Octopus
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Juni
o
C Haman
o
U
p
d
a
te the c
a
s
e
tabl
e
in t/t1
0
00
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hama
n
o
Merge ma
s
ter
.
kernel
.
org:
/
h
ome/hpa/git
/
da
e
mon
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C Hamano
g
it-
c
ommit: use upd
a
te-index
--stdin, instead of
xa
r
gs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
Haman
o
update-ind
e
x:
d
o
c
ument
-
-std
i
n and -z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C
H
ama
n
o
update-ind
e
x: --stdin and -z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C Hamano
Really require tk 8
.
4 (R
P
M
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Haman
o
Require tk
8
.
4 (RPM)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io
C
Hamano
Merge
http://
w
ww
.
kernel
.
org/
p
u
b
/scm/gi
t
k
/
git
k
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
g
i
t-f
e
tch: send informatio
n
al output to >&2 consistently
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hama
n
o
G
i
ve d
e
fa
u
lt merge m
e
ss
a
ge after f
a
iled automerge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hamano
Do not require c
l
ean tree wh
e
n
r
everting an
d
cherry
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio
C
Hamano
Fix overzealous
cleanline
s
s
check in git-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
i
o
C Haman
o
git-clone: ch
e
ck out
"
m
ast
e
r" by default
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-26
Jun
i
o 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
J
unio C Hama
n
o
Diff: --name-status output format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
n
i
o C Hamano
D
i
f
f: -
l
<num>
to lim
i
t rename/cop
y
detection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff clea
n
-
up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C Hamano
Merge bran
c
h 'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hama
n
o
Clean generated files a
bit mor
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
io C Hamano
Stop installing the backward com
p
a
t
ible symlinks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ham
a
no
show-bra
n
c
h: f
i
x commit naming bre
a
kage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
git-grep: fix 'git gr
e
p -e $p
a
ttern' handling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ha
m
a
no
Remove use of 'xargs -0' fro
m
git-re
s
et
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hama
n
o
Use 0
.
99
.
7
.
GIT as version between
0
.
99
.
7 and
0
.
99
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Solaris: give
a bit
m
ore built-in
defaults
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ha
m
a
no
Really ignore g
e
nera
t
ed
d
i
s
tribution material
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
daemon
.
c
: pid_t is n
o
t int
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o
C Ha
m
an
o
M
erge 'fi
x
es' branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
m
ano
Furthe
r
clarify licensin
g
st
a
t
us of
co
m
pat/subprocess
.
py
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Juni
o
C H
a
mano
Ignore a bit more generat
e
d files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
J
u
ni
o
C Ha
m
ano
Merge br
a
nch 'f
i
xes'
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o
C Hamano
Ma
k
e 'gi
t
d
iff --c
a
c
h
ed' synonymous to 'git
diff -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C Hamano
Do not give alarm
i
n
g e
r
ror
message from rsync in fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Pre
t
t
y
pri
n
t octopus merge message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Jun
i
o C Hamano
Retire d
i
ff-
h
elper
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Juni
o
C
H
amano
Retir
e
r
ev-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io C Hamano
Retire git-
e
xport
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hama
n
o
Revert
"Use git-me
r
ge instea
d
o
f
git-resolve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C
Hamano
Rev
e
rt "Make O
c
top
u
s
merg
e
messag
e
a bit n
i
cer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Merge branch
'
f
i
xes'
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C
Hamano
Fix do
c
umen
t
ation
dependency
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hama
n
o
M
a
ke object creation in http fetch a b
i
t s
a
fer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
C
l
arify dual lice
n
se
s
t
atus of subprocess
.
py
f
ile
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Ha
m
ano
Update tutoria
l
wi
t
h Octop
u
s usa
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Hamano
Make Octopus merge message
a
bit nicer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
mano
U
se git-merge
i
nstead of git-res
o
lve in git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Do
not give
alarming error mess
a
ge fr
o
m rsync in fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
unio
C
Hamano
Show modified fil
e
s in gi
t
-ls-fi
l
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C H
a
man
o
F
a
st-path 'updat
e
-index --refresh'
a
bit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Jun
i
o C Ham
a
no
Use GECO
S
f
i
e
l
d a bit better to pro
d
uce default human
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C Hamano
Document -
i
fl
a
g to git-read-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
S
hip ou
r
own copy of subprocess
.
py
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ha
m
ano
s
h
ow-branch: Be nicer when running in a corrupt repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
i
o
C Hamano
GI
T
0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio
C Haman
o
Arrgh -- another asciidoc
caret
workaroun
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Juni
o
C Hama
n
o
Document e
x
tended SHA1 used
by git-rev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
Hamano
fet
c
h() assumes we do not have the obj
e
ct
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Merge branch 'master
'
of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Hamano
Improve
t
h
e safety
check used i
n
fet
c
h
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C
H
a
m
ano
Archive-de
s
troying "git
repack -a -d" bug
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
u
nio C Hamano
D
o
no
t
fai
l
after c
a
ll
i
ng bisect_auto_
n
ext(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Ha
m
ano
F
i
x typo in test
comment
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
[P
A
TCH] get
d
omainnam
e
sh
o
uld b
e
u
s
able on S
u
n
O
S with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Juni
o
C Ham
a
no
Add g
i
t-send-
e
ma
i
l to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
u
n
i
o C Hama
n
o
Teach r
s
ync transport about alternates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Juni
o
C Hamano
[
P
ATCH] fetch
.
c: cleanu
p
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Jun
i
o C Hamano
[PATCH] Mak
e
git-checkout
f
ailur
e
m
e
ssage mor
e
friendly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Ju
n
io C Haman
o
Recommend
'
less' for Debi
a
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
Revert b
r
eaka
g
e intr
o
duced by c8052
2
e
3
0fdc190f8c8c7
f
c983bb
e
0
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Haman
o
Plug diff leaks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Jun
i
o C H
a
mano
Avo
i
d was
t
ing memory w
h
ile k
e
eping track o
f
what we
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
Hamano
Be more backward compatibl
e
with git-
s
sh-{push,pull}
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Juni
o
C Ha
m
an
o
Unopti
m
ize
i
nfo/re
f
s creat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Retire info/re
v
-cac
h
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Jun
i
o
C Hamano
git-b
r
anch -d <bra
n
c
h>:
d
elete unused b
r
anch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
J
unio C Hamano
Revert "[PATCH] plu
g
memo
r
y
leak in diff
.
c::diff_free_
f
ilepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Ju
n
io C Hamano
Mak
e
merge comm
e
nt git-
p
ull ma
k
es for a
n
oc
t
opus a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Merge br
a
nc
h
'
m
aster' of
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hama
n
o
read
-
tr
e
e: fix bogus deb
u
g
g
ing
sta
t
emen
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
J
u
nio C Ham
a
n
o
gi
t
-merge-recurs
i
ve:
T
riv
i
al RE fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Haman
o
[
P
ATCH] Define
re
l
ative
.
g
it/objec
t
s
/
inf
o
/alte
r
n
a
tes
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
unio
C Hamano
Det
e
ct ls-rem
o
te f
a
ilure
p
rop
e
rly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C Hamano
Fix
o
ff-by-
o
n
e 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
mano
Propagate error
s
from fe
t
ch-p
a
ck co
r
rectly to git-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Fix CDPATH problem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ham
a
no
Merge br
a
nch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio
C
Hamano
D
o
c
u
m
ent git-gre
p
and li
n
k i
t
fr
o
m
the ma
i
n gi
t
(
7
)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PAT
C
H
]
Mak
e
'git checkout' a
bit more f
o
rgivin
g
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
ni
o
C H
a
m
ano
[PATCH] Omit
patch
e
s t
h
at have alread
y
been
merged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
J
u
nio C H
a
mano
Al
l
ow findin
g
things that begin with a dash in 'git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Merge
branch 'mas
t
e
r'
o
f
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
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
Prepare 0
.
99
.
7 releas
e
candid
a
te branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hamano
Add a new
m
e
rge
strategy by Fred
r
ik Kuiv
i
nen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
H
amano
'git-merg
e
': Docu
m
enta
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Use Daniel's
r
ead-tree
i
n the mer
g
e
s
trate
g
y 'resolve
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C
Ha
m
ano
Multi-backend
merge dr
i
ver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Plug leak in Daniel's
r
e
ad-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
de
b
ugging help for case #16
t
o
r
ead-tr
e
e
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next