repo.or.cz
/
git
/
dkf.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
Haman
o
Use git
-
m
erge in git-
p
ull
(
se
c
ond tr
y
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
J
u
nio C Ham
a
no
Use git
-
upd
a
te-ref in
s
c
ripts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Fast
p
ath th
e
norm
a
l case by not ch
e
cking
t
hat index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Juni
o
C Hamano
Fix default pu
l
l not to do
a
n unintend
e
d
O
ctopus
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Update the case table
i
n
t
/t1000
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Merge maste
r
.
k
e
rn
e
l
.
org:/hom
e
/hpa/git/daemon
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Ham
a
no
gi
t
-commit:
u
se update-index --st
d
in, inste
a
d
o
f
xargs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Jun
i
o
C
H
amano
update
-
ind
e
x
: document --stdin
and -z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Haman
o
update-in
d
e
x
: --stdin and -z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio
C
Haman
o
Real
l
y requi
r
e tk 8
.
4 (RPM)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Ham
a
no
Require tk 8
.
4 (RPM)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
unio C H
a
mano
M
e
rge http:
/
/www
.
k
ernel
.
org/pub/scm/gitk/git
k
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
ma
n
o
gi
t
-fetch: send in
f
o
rma
t
iona
l
out
p
ut
to >&2 consistently
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hama
n
o
Give defa
u
lt merge
m
essage
a
fter fa
i
le
d
automerge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C Ham
a
no
D
o
not require
c
l
ean tr
e
e wh
e
n reverting and
cherry
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Ha
m
ano
F
ix overzealous cleanliness chec
k
in gi
t
-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hamano
git-c
l
o
n
e
: check out "master" by de
f
au
l
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-26
Junio C Hamano
Plug
a
smal
l
race in update-ref
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C Hamano
Diff: --name-stat
u
s
o
u
t
p
u
t
form
a
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C
Hamano
Diff: -l<num>
to limit renam
e
/
c
opy dete
c
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Dif
f
clean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Ha
m
ano
Merg
e
branch 'fi
x
es'
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
mano
Clean g
e
ne
r
ated f
i
les a bit mor
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Juni
o
C Ha
m
ano
S
t
op
i
nst
a
llin
g
the
b
a
ckward
c
ompatibl
e
sym
l
inks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Ha
m
an
o
show-br
a
nch: fi
x
co
m
mi
t
nam
i
ng breakage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
unio C Haman
o
g
i
t
-grep: fix 'git grep -e $patter
n
'
h
andling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Remo
v
e use of 'xargs -0' from git-r
e
set
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Use 0
.
99
.
7
.
GI
T
a
s
version b
e
tw
e
en 0
.
99
.
7
a
nd 0
.
99
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
ni
o
C Ha
m
a
n
o
S
ola
r
is: give a bit more built-in defaul
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C Hamano
Rea
l
ly
ignore gener
a
ted
di
s
tribution materia
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C Ha
m
ano
daemon
.
c: pid_t
i
s
not int
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio
C Hamano
Merge 'fi
x
e
s' branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Haman
o
Further clarify lice
n
sin
g
status
o
f compat/subprocess
.
p
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Ha
m
ano
Ignore a bit more
genera
t
e
d files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
J
u
n
i
o C
H
a
mano
Make 'g
i
t diff --c
a
ched' synon
y
mous to 'g
i
t diff -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Do not give alarming error message from rsync in fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C
H
ama
n
o
Prettyprint oct
o
pus merge me
s
sage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C
Hamano
Retir
e
diff
-
helper
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire rev-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Retire git-export
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
Hamano
Re
v
ert "Use
g
i
t-m
e
rge
inst
e
ad of gi
t
-resolve in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "
M
ake Octopus merge
m
essage a
bit
n
icer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Hamano
Merge bra
n
ch 'fi
x
es'
commit
|
commitdiff
|
tree
2005-09-21
J
u
n
io C Hamano
F
i
x docume
n
t
atio
n
d
epen
d
ency
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Hamano
Make obje
c
t creation in http fe
t
ch a bit safer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ha
m
an
o
Clarify d
u
al
license sta
t
us of subprocess
.
py
f
ile
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Update tut
o
r
i
al with O
c
t
opus usage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C
H
amano
Make Octopus mer
g
e message a bit nicer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io
C
Ha
m
ano
Use git
-
m
e
rge ins
t
ead of git-
r
esolve in git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Haman
o
Do not
give alarming e
r
ror message
f
r
o
m rsync in
f
e
tch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Sh
o
w
m
odified fil
e
s in g
i
t-ls-f
i
les
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
uni
o
C Hamano
Fast-pa
t
h 'update-in
d
ex --refresh' a b
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Haman
o
Use GECOS fie
l
d a bit
b
etter to
p
rod
u
ce defa
u
lt human
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Juni
o
C
Hama
n
o
Doc
u
ment
-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 Hamano
Ship our o
w
n copy of subpro
c
es
s
.
py
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio
C
H
a
mano
show-branch: Be nicer when runn
i
ng in a corr
u
pt repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio C H
a
mano
A
r
rgh
-
- anothe
r
as
c
i
i
doc
c
ar
e
t workaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o
C
Haman
o
Document e
x
t
ended S
H
A
1
u
s
e
d by git-re
v
-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C H
a
ma
n
o
fetch() a
s
sume
s
we do
n
ot have the object
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Merg
e
b
ranch 'master'
o
f
.
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o C Hama
n
o
Improve the
s
a
fety
check used in fe
t
ch
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o
C Hamano
Archive-destroying "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
am
a
n
o
Do not fail after ca
l
ling bisect_au
t
o_next()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Ham
a
n
o
F
i
x
t
ypo
i
n test comme
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
[PATCH] g
e
tdomainname sho
u
ld be usable on Su
n
OS
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Add
g
it
-
sen
d
-
e
mail to
.
gitignor
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Ha
m
ano
Teach rsync
transport about alterna
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
J
unio
C Ha
m
ano
[PA
T
CH] fetch
.
c: cl
e
anups
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
[
P
ATCH] Make git-check
o
ut fai
l
ure m
e
ssage more friendly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Ha
m
an
o
Recomm
e
nd
'
less' for
D
ebian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Juni
o
C Hamano
Rever
t
breakage i
n
troduced b
y
c8
0
522e30
f
d
c
190f8
c
8c7fc983bbe0
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
i
o
C Hama
n
o
P
lug
d
i
f
f leaks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C H
a
m
ano
Avoid wasting
m
emory w
h
ile keeping tra
c
k o
f
what we
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C
Hama
n
o
B
e
m
or
e
bac
k
w
ar
d
c
omp
a
tib
l
e with
git-ssh-{push,pull}
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Unoptim
i
ze info/refs c
r
eation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hama
n
o
Retir
e
info/rev-c
a
che
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Juni
o
C Hama
n
o
git-br
a
nch -d <branch>: dele
t
e unu
s
ed bra
n
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C
Hamano
Revert "[PATCH] plug memory leak in diff
.
c
:
:diff
_
free_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio
C
H
a
man
o
Make me
r
ge co
m
ment 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
e
rge branch
'master' of
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
r
ead-tre
e
: fix bogus de
b
ugging statement
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
J
u
nio C
Hama
n
o
g
i
t-m
e
rg
e
-recursive: Trivial RE
fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C Hamano
[PATCH] De
f
in
e
r
e
lative
.
git/object
s
/info/alternate
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C
H
amano
Detect l
s
-
r
e
mo
t
e
failure pr
o
p
erly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hamano
F
ix off-by-on
e
error
in g
i
t-mer
g
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hamano
Prop
a
gate er
r
ors fro
m
fetch-pack co
r
rectly to git
-
f
e
t
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hamano
Fi
x
CDPATH pro
b
lem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C H
a
ma
n
o
M
erge bra
n
ch 'm
a
ster
'
of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Hamano
D
ocument git-gre
p
and
l
ink
it from the main
g
it(7)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C Hamano
[PATCH] Make
'git
c
heckout'
a bit more
f
orgiv
i
ng w
h
en
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o
C
Hamano
[PATCH] Omit
p
atche
s
t
hat
h
a
v
e
a
lrea
d
y
been merged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio
C
Hama
n
o
Allow fi
n
d
i
n
g thing
s
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
M
e
r
ge branch 'master'
of
.
commit
|
commitdiff
|
tree
2005-09-12
Junio
C Hamano
Use int instead of socklen_
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
H
amano
Prepare 0
.
99
.
7 rel
e
ase cand
i
date branch
.
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 Ku
i
vinen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Ham
a
no
'git-merge
'
: Docum
e
ntation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Jun
i
o C Hamano
U
s
e
Daniel's read-tree in the merge
s
tra
t
e
gy 'resolve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next