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 Ha
m
a
no
Use git-m
e
rge
i
n
git-pull (second t
r
y)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Ha
m
ano
Use git-up
d
ate-ref in scr
i
pts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Juni
o
C Hama
n
o
Fastpath t
h
e nor
m
al case by not checking that index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hama
n
o
Fix
d
efault p
u
ll no
t
t
o
do an unintended Octo
p
us
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C
Hamano
Update
t
he case ta
b
le i
n
t/t1000
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-28
J
u
nio C
Ha
m
a
n
o
M
erge master
.
k
e
rne
l
.
org:/home/hpa/git/daemon
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C
Hamano
git-com
m
it: use up
d
a
te
-
i
n
dex
-
-stdin, instead of xa
r
gs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hamano
u
p
d
ate-i
n
dex: do
c
ume
n
t
--stdin an
d
-z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
Hamano
u
p
date-ind
e
x: --st
d
in and -z
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Haman
o
Really re
q
uire tk 8
.
4 (RPM)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
R
equire
t
k 8
.
4
(
R
P
M)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Haman
o
Merge http:
/
/www
.
k
ern
e
l
.
or
g
/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o C Hamano
git-fetch: send inform
a
tional o
u
tput to >&
2
co
n
sistentl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Juni
o
C Haman
o
G
i
v
e default
m
erge message after failed automerge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C Hamano
Do not require clea
n
t
r
ee when reverting a
n
d cherry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hama
n
o
Fix ov
e
r
z
ealous clean
l
ines
s
ch
e
c
k
in git-mer
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o C Hamano
git-
c
lo
n
e:
c
heck out "
m
ast
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
Hamano
Plug
a
s
mall race
in
up
d
ate-ref
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff: --
n
a
m
e-status
o
utput
format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Jun
i
o C Hama
n
o
Diff:
-
l<num>
to l
i
mit rename/copy de
t
ectio
n
.
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
J
u
n
i
o C Hamano
Merge branch
'fixes'
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Haman
o
Cl
e
a
n generat
e
d files a bit more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
io C H
a
mano
Stop
installing the backw
a
rd compatib
l
e symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hamano
show-branch: fix
c
ommit naming breakage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Haman
o
git-grep: fix 'git grep
-e
$
pattern'
h
andl
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
amano
Remove use of 'xargs
-0' from git-re
s
et
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
unio C Hamano
Us
e
0
.
99
.
7
.
G
I
T as versio
n
b
e
t
wee
n
0
.
9
9
.
7 and
0
.
99
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
S
olaris:
giv
e
a bit more built-in de
f
a
u
lts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
R
e
a
lly
ignore
generat
e
d distribution material
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C Hamano
d
aemo
n
.
c: pid
_
t
i
s n
o
t 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
Junio C Hamano
Furthe
r
c
larify lic
e
n
s
ing status
o
f compat/
s
ubprocess
.
py
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C Hamano
Ignore a bit more generated
f
iles
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio
C Hama
n
o
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C Hamano
Make 'git
diff --cached' synony
m
ous to
'git diff
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Juni
o
C Hamano
Do not g
i
ve
a
larming error m
e
ssage from
rsync in
f
etch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-23
Junio C H
a
m
ano
Prettyprint
o
ctopus merge message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire diff-h
e
lpe
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
J
u
nio
C
Haman
o
Reti
r
e rev
-
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-22
Junio C
H
amano
Retire
git-export
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
unio C Hamano
R
e
v
e
rt "Use git-merge ins
t
ea
d
of git-reso
l
ve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
H
amano
Re
v
e
r
t "Make Oct
o
pus merge message a bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
amano
Merge branch 'fixes
'
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Fix documenta
t
ion dependency
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C H
a
mano
M
ake object creatio
n
in h
t
tp fetch a
b
it safer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hama
n
o
Clarify du
a
l license
s
tatus o
f
s
u
bp
r
o
c
ess
.
py file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Hamano
Up
d
ate tutorial
w
ith
O
ctopus usa
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Haman
o
Make Octopus m
e
rge m
e
ssa
g
e a bit nicer
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-21
J
u
n
i
o C H
a
mano
Use git-me
r
ge
in
s
tead of git-r
e
sol
v
e
in
g
it-pul
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
Ha
m
a
n
o
Do not
give alarming er
r
or
message from rsync
in fetc
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
Show modified files in git-ls-files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C H
a
man
o
Fast
-
pa
t
h 'update-index
--ref
r
esh'
a bit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
H
amano
Use GECOS field
a bit be
t
ter
to produ
c
e
d
efault
human
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Docum
e
nt
-
i fla
g
to g
i
t-read
-
tree
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Ship our own copy
o
f su
b
p
r
oces
s
.
p
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-20
J
u
n
i
o C Hamano
show-branch: Be
n
icer when running in
a corrupt r
e
po
s
itor
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C H
a
m
a
no
G
I
T
0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C H
a
m
a
no
Arrgh --
a
nother
a
sciidoc
c
aret workaro
u
nd
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio
C Hamano
D
o
cument extended SHA1 used by git-rev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
fetch() assumes we
do
n
ot
h
a
ve the object
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Mer
g
e branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-18
Junio C
H
amano
Improve
t
h
e
s
a
fety chec
k
u
sed in
f
e
t
c
h
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Hamano
Archive-destroyin
g
"git re
p
ack -a -d" bug
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
H
amano
Do n
o
t
f
a
i
l afte
r
calling bisec
t
_auto_next()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Fix typo in test c
o
m
m
e
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
u
n
i
o
C Hamano
[PATCH] getdomainna
m
e should be usable on SunOS with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Ha
m
ano
Add git-send
-
em
a
il to
.
gitignor
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-17
J
u
n
io C Hamano
Teach rsync tran
s
port about altern
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
u
ni
o
C Ha
m
ano
[PATCH]
f
e
t
ch
.
c:
cleanups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Junio C
H
a
m
ano
[PATCH] Make git-checkou
t
failure message more fri
e
ndly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
J
u
nio C
H
a
m
ano
Recomme
n
d 'less' for
D
ebian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-16
Jun
i
o C Hamano
Revert breakage introd
u
ced
b
y c80522e30fdc19
0
f8c8c7
f
c983bbe0
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hama
n
o
Plug diff
l
e
a
ks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Avoid wast
i
ng
m
em
o
ry while ke
e
ping track of wh
a
t we
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
u
nio C Hamano
Be m
o
re backward compa
t
i
ble
w
ith git-ssh-{push,pull}
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
unio
C
Hamano
Un
o
ptim
i
ze info/refs c
r
eation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
R
e
tire info/rev-cache
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-15
J
u
nio C Hamano
git-br
a
nc
h
-d
<branch>: delete unused branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
J
u
nio C Hamano
Revert "
[
PATCH] plug
memory l
e
ak in dif
f
.
c:
:
d
iff_free_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio
C
H
amano
Make
merge comment
g
it-pull makes for an
o
ctopus a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
M
e
r
ge b
r
a
n
c
h
'
m
a
ster' o
f
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hama
n
o
read-tree: f
i
x bogus debugging s
t
atement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-14
Jun
i
o C Hamano
git-merge-recu
r
sive: Trivial RE f
i
xes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C
Hamano
[PATCH
]
Define r
e
l
ati
v
e
.
git/ob
j
ect
s
/info/alternates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C
H
ama
n
o
Detect ls-remote failure proper
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
ano
Fix off-
b
y-one error
in
git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C Ham
a
no
P
r
opagate er
r
or
s
from f
e
t
c
h-pac
k
correctl
y
t
o git-fe
t
ch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
n
io C Hamano
Fix C
D
PATH problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
an
o
M
e
rge branch 'm
a
ster'
o
f
.
commit
|
commitdiff
|
tree
2005-09-13
J
unio C
H
am
a
n
o
Document git-grep and l
i
nk it fro
m
the m
a
i
n git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
ano
[PATCH] Make 'git checkout' a b
i
t more f
o
rgivin
g
w
h
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PATCH]
Omit patches that have alread
y
been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
J
u
nio C Hamano
Al
l
o
w
findin
g
thing
s
that begin
w
i
th a d
a
s
h
i
n 'g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hama
n
o
Merge branch 'master'
of
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C
Hama
n
o
Use int i
n
stead of socklen_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ha
m
ano
Prepare 0
.
99
.
7 rele
a
se candidate branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
n
io C Ha
m
ano
Add a new mer
g
e strateg
y
by Fred
r
ik Ku
i
vine
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Hama
n
o
'
g
it-me
r
ge
'
: Documentat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
io
C Ha
m
ano
Use Da
n
iel's read-tree
i
n
t
h
e me
r
ge strategy
'
r
esolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next