repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Use git-merge in git-pull (second try).
2005-09-29
Junio C H
a
mano
Use
git-merge in git-pull
(second try)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C H
a
mano
Use git-update-ref i
n
scri
p
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hama
n
o
F
a
s
tpath th
e
norm
a
l case by not
c
heck
i
ng that
i
ndex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Fix
d
ef
a
ult pull not
t
o
do an unintended
O
ct
o
pus
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hama
n
o
Upda
t
e the case table in t/t
1
0
0
0
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C
Hamano
Merge
m
ast
e
r
.
kernel
.
org:/home/hp
a
/git/daemon
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio C
Haman
o
git-co
m
mit: use upda
t
e-index --stdin,
i
nstead of xargs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hama
n
o
up
d
ate-i
n
d
ex: do
c
ument --stdin
and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C H
a
mano
update-index: --stdin
and -
z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
R
e
ally
r
e
quire tk 8
.
4
(RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
Require tk 8
.
4 (RP
M
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Merge htt
p
://w
w
w
.
k
ernel
.
org/
p
u
b/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-09-27
Junio C Ha
m
ano
git-fetch: sen
d
informational
o
u
t
put to >&2 co
n
sist
e
n
tly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C
H
amano
Give
default m
e
rge m
e
ssage after
f
ailed automer
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
H
am
a
n
o
Do not
r
equire clean t
r
ee
w
hen reverting and cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Fix ove
r
zealous cleanlines
s
che
c
k
in git
-
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git-clone: c
h
ec
k
out "master" by d
e
fault
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-26
Ju
n
i
o C
H
a
mano
Pl
u
g a smal
l
race in
u
pdate-r
e
f
.
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
Jun
i
o
C
H
amano
Di
f
f: -l<
n
um> to limit
rename
/
co
p
y dete
c
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Di
f
f cl
e
a
n
-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hamano
M
erge br
a
nch '
f
ixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio C
Hamano
Clean
gene
r
at
e
d
f
iles a
b
i
t more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Haman
o
Stop installing the b
a
c
k
w
ard compatib
l
e symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C Hamano
show-branch: fix commi
t
n
a
ming breaka
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
unio
C
Hamano
git-grep: fix 'git g
r
e
p -e $pattern' handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C H
a
mano
R
e
m
o
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 Hamano
U
se 0
.
9
9
.
7
.
GIT as versio
n
between 0
.
99
.
7 and 0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o
C Hamano
Solaris: give
a bit more built-in defaults
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Really ignore
g
enerated distribut
i
on material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
d
a
emon
.
c: pid
_
t is not int
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ha
m
ano
Merge 'fixes' br
a
nch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C Hamano
Further clarify l
i
c
ensin
g
s
t
atus o
f
compat/subprocess
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C
Ha
m
an
o
Ignore a bit more gener
a
te
d
files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
J
unio C Hamano
Merge branch 'fi
x
es'
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Make
'git
diff --cached' synon
y
mous
to
'git d
i
ff -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C
Hamano
Do not give ala
r
ming
error
message from rsync
in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C H
a
man
o
Prettyprint octopus merge mes
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Ju
n
io C Hamano
R
e
tire diff-he
l
per
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio
C
Hamano
Re
t
ire rev-t
r
ee
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
J
un
i
o
C
Hamano
Retir
e
g
it-e
x
port
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "Us
e
git
-
merge instead of
g
it-resolv
e
i
n
git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "Make Oct
o
p
us
me
r
ge me
s
sage a bi
t
nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
i
o C Ha
m
ano
M
e
rge
b
ranch 'fixes'
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C H
a
man
o
Fix documentation dependency
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Ham
a
n
o
Make object crea
t
ion in http
fetch
a
b
i
t safer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C H
a
ma
n
o
C
lari
f
y dual
l
i
cense status of subprocess
.
p
y file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C
H
amano
Update tutorial with Oct
o
pus usa
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hama
n
o
Make Octo
p
us merg
e
message a bit nicer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
a
m
ano
Use
g
it-merge
instead
o
f git-
r
eso
l
v
e
in g
i
t-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Do n
o
t gi
v
e alarmin
g
err
o
r message from
rsync in fetch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Show modifi
e
d files i
n
gi
t
-
ls-
f
iles
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ha
m
ano
Fast-pat
h
'update-index
-
-refresh' a bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ha
m
ano
U
s
e
G
ECOS field a bit better to pro
d
uce defaul
t
human
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Jun
i
o C
H
amano
Document -i flag t
o
git
-
read-tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io
C H
a
mano
Ship our own copy of s
u
bproce
s
s
.
py
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
show-br
a
nch: Be nicer
when
r
unning in a corrupt
r
ep
o
sitory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C Ha
m
a
no
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Hamano
Ar
r
gh -- an
o
ther
a
scii
d
o
c
caret workaro
u
nd
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Document extende
d
SHA1
use
d
by git-rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Hamano
fetch(
)
assu
m
es
w
e
do not have the objec
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Hamano
Merge bra
n
ch '
m
ast
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Improve the safety che
c
k used in fe
t
ch
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Juni
o
C Hamano
Arc
h
i
ve-de
s
tr
o
yi
n
g "git repack -a -d
"
b
ug
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Juni
o
C
Hamano
D
o
not fail afte
r
calling bisect_auto_next(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Fix typo in tes
t
c
omment
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
[P
A
TCH]
getdomainname should be us
a
b
l
e on
S
unOS with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
H
amano
Add git-send-email to
.
giti
g
nor
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Ju
n
i
o C Hamano
Te
a
ch r
s
ync transport
a
bout altern
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C
H
a
m
ano
[PATCH] fetch
.
c:
c
leanups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
[PATCH] Make git-checkout failure message m
o
re friendl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C
H
aman
o
Recommend 'less' f
o
r Debia
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
u
nio C
Hamano
R
e
vert
breakage introd
u
ced by c
8
0
5
22e30fdc190f8c
8
c7fc983bbe0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
Hamano
Plug diff le
a
ks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
Hamano
Avoid wasting memory while keepin
g
track of what we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Ha
m
a
n
o
Be more
backward
compatible with git-ssh-{push,p
u
l
l
}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
unio C Hama
n
o
Unoptimize info
/
refs cre
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
unio C Hamano
Retire info/rev-cache
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C H
a
m
a
no
git-branc
h
-d
<
branch>
:
delete u
n
used br
a
n
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Re
v
ert "[PA
T
CH
]
plug memory leak in
d
iff
.
c
:
:diff_fre
e
_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
J
unio C Haman
o
Make m
e
rge comment git-pull mak
e
s for an octo
p
us
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Ju
n
i
o
C
Hamano
Merge branch
'master' of
.
commit
|
commitdiff
|
tree
2005-09-14
Juni
o
C Hamano
read-tree: fix bog
u
s
debugging stateme
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
git-merge-recursive: Trivial RE fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Hamano
[PATCH] Define re
l
ativ
e
.
g
it/objects/info/alter
n
ates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Dete
c
t
ls-
r
emote failure properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
F
ix
o
ff-by
-
o
n
e error in git-merg
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C H
a
m
ano
Propaga
t
e errors from fe
t
ch-pack correctly to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Haman
o
Fix C
D
PATH problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C
H
amano
Merge
branc
h
'master
'
of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hama
n
o
D
o
cument git
-
grep and
l
ink it from the main git(
7
)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hama
n
o
[PATCH] Make
'
git
checkout' a bit more
f
orgiving
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
[
PATCH] Om
i
t patches that hav
e
already been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Jun
i
o C Hamano
Allow f
i
nding things
that begin with a dash
i
n
'
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C H
a
mano
Mer
g
e branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Use int inst
e
ad
of
socklen
_
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
ca
n
didate br
a
nc
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
A
dd a
n
ew merge strategy b
y
Fredri
k
K
uivine
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C H
a
mano
'
git-me
r
ge
'
: Doc
u
mentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Hamano
Use
D
aniel's read-
t
ree
i
n
th
e
merge strat
e
g
y
'
resolve
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next