repo.or.cz
/
alt-git.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 Hamano
Us
e
gi
t
-merge in git-pull (second try)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
J
unio C Hamano
Use g
i
t-upda
t
e-r
e
f
in scripts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio
C
H
a
mano
Fastpath the normal
c
ase by not
c
hecking that
index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
J
u
nio C Hamano
Fix default pul
l
not to do a
n
un
i
nt
e
nded Octopus
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C H
a
mano
Update
t
he c
a
se
t
able in
t/t1000
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-28
Junio C Hamano
Merge master
.
ke
r
nel
.
org:/home/hpa/git
/
daemon
commit
|
commitdiff
|
tree
2005-09-27
Junio C
H
amano
git-com
m
it: u
s
e
updat
e
-index
--stdin, instead
of
xargs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio
C
Hamano
u
pd
a
t
e-index: document -
-
std
i
n and -z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C H
a
mano
updat
e
-
index: --std
i
n and
-z
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Ju
n
io C Hamano
Really require
t
k 8
.
4 (RPM)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
unio
C
Hamano
Require tk 8
.
4 (
R
PM)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Me
r
ge http:
/
/www
.
kernel
.
o
rg
/
pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git-f
e
tch: send informational outpu
t
t
o
>&2 c
o
nsistently
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
J
u
nio
C
H
amano
Giv
e
default merge m
e
ssag
e
afte
r
f
a
iled aut
o
merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Haman
o
Do
n
o
t require clean tree when reverting a
n
d cherry
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
Fix ov
e
rzeal
o
us c
l
e
anliness
c
heck in git-
m
erge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C Hamano
git-clo
n
e
:
c
h
eck o
u
t "master" by de
f
ault
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-26
Jun
i
o C
H
amano
Plug a small race in update
-
ref
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C Ha
m
a
n
o
Diff
:
--name-statu
s
o
u
tput 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 limi
t
re
n
ame/copy det
e
ction
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
unio C Haman
o
D
iff clean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
M
e
r
ge branch 'fix
e
s'
commit
|
commitdiff
|
tree
2005-09-25
Ju
n
io
C
Ha
m
ano
Cl
e
a
n g
e
ner
a
ted fi
l
es a bit more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Stop
i
n
sta
l
ling th
e
b
ackward co
m
pati
b
l
e s
y
mlinks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C H
a
mano
s
how-br
a
nch: fix commit namin
g
b
re
a
kage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C Haman
o
g
i
t
-grep:
f
i
x 'git gre
p
-e $
p
attern' ha
n
dling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C Ha
m
ano
R
e
move use of
'xargs -0' from gi
t
-
reset
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Ju
n
io C
H
ama
n
o
Use 0
.
99
.
7
.
G
I
T
a
s version
b
etwe
e
n 0
.
99
.
7
a
nd 0
.
99
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Solaris
:
g
i
ve
a bit more bui
l
t-in d
e
faults
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
Hamano
R
e
ally ignore generated d
i
stribution
m
ate
r
ial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C Haman
o
dae
m
o
n
.
c: pid_t is not
i
nt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Jun
i
o C Hamano
Merg
e
'
f
i
xes' br
a
nch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Hamano
Further clarify licensing status of compat/s
u
bpro
c
ess
.
py
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Ignor
e
a bi
t
more genera
t
ed files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o
C
Hamano
M
e
rge
b
r
a
nch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
M
ake
'
git diff --cached'
s
yno
n
ymou
s
to 'git diff
-
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Jun
i
o C Ham
a
no
Do not give a
l
arming e
r
ror message from
rsync in f
e
tch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
J
u
nio
C
H
a
m
ano
Prettyprint
octopus merge message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
R
e
tire
di
f
f-helper
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C Hamano
Re
t
ire rev-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio C H
a
m
a
n
o
R
e
t
ire git
-
expor
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o
C
H
amano
Revert "Use
g
it-merge instead of git-resolv
e
in git
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Ju
n
io C Hamano
Revert "Make Oc
t
o
pu
s
merge m
e
ssage a bit nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Hamano
Mer
g
e branc
h
'
f
i
x
es'
commit
|
commitdiff
|
tree
2005-09-21
Junio
C Hamano
Fix documentat
i
on dependency
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
u
nio C Hamano
Make
ob
j
e
ct creation
i
n http fetch
a b
i
t safer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Cla
r
ify dual l
i
cense status of subpr
o
cess
.
py file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hama
n
o
Update tutorial
w
i
t
h Octopu
s
usage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Ham
a
no
Make Octopus merge messag
e
a bit nicer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hama
n
o
Use git-mer
g
e
instead o
f
git-resolve in git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
D
o
not gi
v
e alarm
i
ng error mess
a
ge fro
m
rs
y
nc in
f
etch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
unio C
Hamano
Show modifi
e
d files
i
n
git-ls-file
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
Hamano
Fast
-
pa
t
h 'update-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
GECOS field a bi
t
better
to produce default human
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C
Hamano
Document -i
f
lag to git
-
read-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Ship ou
r
own copy of subproc
e
ss
.
py
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
J
unio
C
Ham
a
n
o
show-branch
:
B
e nicer
w
hen
run
n
ing
i
n
a corru
p
t repos
i
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Ju
n
io C Hama
n
o
GIT
0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Hamano
Arrgh -
-
a
n
other asc
i
idoc caret workaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Juni
o
C Ham
a
no
D
ocu
m
ent extended SH
A
1 used by git-rev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
J
unio C Hamano
fetch() assumes we do
not have the object
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
Hamano
Merg
e
branch
'
m
ast
e
r'
o
f
.
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Hamano
Impr
o
ve the sa
f
ety check used in fetch
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Hamano
Archive-de
s
troyin
g
"gi
t
repack -a -d
"
bug
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
u
nio C H
a
mano
Do not
fail aft
e
r calling
bisect_aut
o
_next()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Juni
o
C Hamano
Fix typo in
te
s
t comment
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
unio
C Hamano
[PATC
H
] g
e
tdomainnam
e
should be usable on SunOS with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Ju
n
io C Hamano
Add git
-
send-email
t
o
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
J
u
nio C Hamano
Teach rsync
transpor
t
abo
u
t altern
a
tes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
J
u
nio C Hamano
[PATCH]
fetch
.
c: cleanups
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Ju
n
io C
H
aman
o
[PAT
C
H
] Make g
i
t
-c
h
eckout fail
u
re message more f
r
i
en
d
ly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
J
u
n
io C Hamano
Recom
m
end 'less' for Debian
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Jun
i
o
C Hamano
Revert br
e
a
k
a
g
e i
n
troduced by c80522e30fdc190f8c8c7
f
c98
3
bb
e
0
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
J
unio C
Hamano
Plug dif
f
lea
k
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Ha
m
ano
Avoid wastin
g
memory while
k
eeping track of
wha
t
w
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
io C Hamano
B
e
m
o
re
b
ackwa
r
d compatible
w
ith git-ssh-{push,
p
ull}
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
U
n
optimize
i
nf
o
/
r
e
f
s creation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Ju
n
i
o C Hamano
Retire info/rev-cache
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Jun
i
o C Hamano
g
i
t
-
branch -d
<b
r
anch>: del
e
te un
u
s
e
d
b
ranch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C
Hamano
Re
v
ert "[PATCH]
p
l
ug memo
r
y l
e
ak i
n
diff
.
c::diff_
f
ree_file
p
a
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Jun
i
o C Hamano
M
a
ke
mer
g
e
comment
git-pull
makes
f
or an octopus
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Merg
e
branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
read-tree: fix bogus debu
g
ging stat
e
me
n
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio C H
a
man
o
git-merge-recur
s
ive:
T
r
ivial RE fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[PAT
C
H] D
e
fi
n
e relative
.
git/objects/info/
a
lterna
t
es
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C H
a
man
o
D
et
e
c
t
ls-remote
f
a
ilure prope
r
ly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ha
m
a
n
o
F
ix off-by
-
one error in
g
i
t
-
mer
g
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Ham
a
n
o
Propa
g
a
te errors fro
m
fetch-pack c
o
rrectly 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
J
u
nio C Ham
a
no
Merge
b
ra
n
c
h 'master' of
.
commit
|
commitdiff
|
tree
2005-09-13
J
un
i
o C Haman
o
Document git-grep
a
n
d link it f
r
om
t
h
e main git
(
7)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
[PATCH] Make 'g
i
t chec
k
out' a bi
t
m
ore forgiving when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio
C
Hamano
[PATC
H
] Omit patches that hav
e
already b
e
en m
e
r
ged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
All
o
w
f
inding things
that begin with a dash
in '
g
it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
J
u
nio C Hamano
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C Haman
o
Us
e
int instead of sock
l
en_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hama
n
o
Prepare 0
.
99
.
7
release
c
andidate br
a
n
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
un
i
o
C Hamano
Ad
d
a
n
ew
m
erge
strat
e
gy by Fredrik Kuivi
n
en
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
unio
C Hamano
'git-merge': Document
a
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hama
n
o
Use Daniel
'
s
read
-
tree
i
n the m
e
r
ge strategy 're
s
olve'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next