repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff
2005-11-17
Junio C Ham
a
no
M
e
r
g
e branch 'tojunio' of
h
ttp://locke
.
catalyst
.
net
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
A
dd approxi
d
a
te test calls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio
C Hamano
tes
t
s: bi
n
ary d
i
ff a
p
pl
i
cation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Juni
o
C Hamano
diff: --full-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Ju
n
io C Hamano
apply: allow-binary-replacement
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Ju
n
i
o
C Hamano
git-
a
m: --reso
l
ved
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Junio C H
a
mano
g
it-apply: fail
i
f
a pat
c
h ca
n
not be applied
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Junio C Hamano
g
it wrapper: b
a
sic fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
sh
a
1_fil
e
.
c
:
:add_packed_git
(
): fix type
m
i
smatch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C
H
amano
di
f
f: make
d
efault r
e
name detection limit configurable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Jun
i
o C Hamano
Documentation: do not bl
i
ndly run 'ca
t
'
.
git/HEAD,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hama
n
o
Up
d
ate t
o
p
o
-order
t
est
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
J
u
nio C H
a
mano
apply: fix binary patch detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C
Hamano
Merge branch 'sv
n
up' o
f
http:/
/
ne
t
z
.
smurf
.
noris
.
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C
Hamano
Sep
a
rate LDFLA
G
S and
C
FLAGS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
J
unio C H
a
mano
Me
r
ge branch
'
s
v
nup
'
of http://
n
etz
.
smurf
.
no
r
is
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Junio C Hamano
Rename lost+found to lost-found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-13
Junio C
Hamano
Debian: build-depend on libex
p
at-dev
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Ju
n
io
C Hamano
Ignore
built git-los
t
+found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Ham
a
no
Documentation: a
s
ciidoc source
s
are utf-8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
J
unio C Ha
m
ano
Rename
.
g
it/lost+found to
.
git/lost-found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C Ha
m
ano
git-lo
s
t+found
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
gi
t
-prune: prune redundan
t
packs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o C Hamano
merge-one-file: use empty- or commo
n
-base condintio
n
a
ll
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C Hamano
Documentation: git-apply --no-add
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o C Hamano
merge-
o
ne
-
file: use c
o
m
mon as base, ins
t
ead of empt
i
ness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
merge with /dev/null as ba
s
e,
in
s
tea
d
o
f punting O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
INSTALL: duplicate python req
u
irements from
M
akefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio
C
H
a
mano
Merge br
a
n
c
hes 'jc/sb' and 'jc/mb
'
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o C
H
amano
t1200: us
e
--topo
-
order
t
o
k
eep the
s
how-branch output
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Jun
i
o
C
H
a
mano
Fully detect un
i
n
teresting
c
ommits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
git-show-
b
ranch: tighten merge-b
a
se com
p
uta
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io
C
Hama
n
o
Add
test case for mer
g
e-ba
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C
H
amano
m
e
rge-ba
s
e
:
avoid
unnecessary p
o
stproces
s
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C H
a
ma
n
o
me
r
ge-
b
ase
:
f
u
l
l
y contaminate the well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C H
a
m
ano
R
P
M: arch sub
m
odul
e
needs tla
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C Hamano
oc
t
o
p
u
s
:
d
o not
do
A
ND'ed me
r
ge base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio C
H
amano
Add --pret
t
y=fulle
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
D
o
not l
o
se
author
n
ame informat
i
on to
locale gotch
a
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
Documenta
t
i
on: "host:path/
t
o
/repo" is git native over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C
Hamano
Make git-re
c
urs
i
ve
the defa
u
lt
s
trategy for git-pu
l
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Use 'me
r
g
e-base --
a
ll' where applicable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C Hamano
Merge branch 'hold/svn'
commit
|
commitdiff
|
tree
2005-11-10
J
unio C Hamano
Merge
b
ranch '
h
old/r
p
m'
commit
|
commitdiff
|
tree
2005-11-09
J
un
i
o C Hamano
git-apply: do n
o
t fai
l
on bina
r
y diff when not applying
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
Junio C Hama
n
o
Update INSTALL
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C H
a
mano
Clean build a
n
no
y
a
nce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
u
nio
C Hamano
F
i
x a couple
of obvious a
n
d
ins
i
gnifican
t
typo
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
Hama
n
o
git-am: do not lose already
e
dited final-commit
when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io C Hamano
Debian: packag
i
ng up
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
unio C Hamano
Tutorial
:
d
o
not us
e
'git r
e
solve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
D
ocum
e
ntati
o
n:
f
ix depe
n
d
ency generatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Jun
i
o C Hamano
Ignor
e
m
o
re generat
e
d files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C Haman
o
Fix documentation de
p
endency generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
Haman
o
Documentation: asciid
o
c
f
o
rmattin
g
fi
x
f
o
r g
i
t-cvsexportcomm
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C H
a
mano
Do not f
a
il on hierarchical t
a
gnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
Re
c
over d
r
op
p
ed
+
x
bit from git
-
pull
.
sh by accid
e
nt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C H
a
m
a
no
D
ocume
n
tation: talk about guts o
f
merge
i
n tu
t
o
r
i
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio
C
H
amano
Set up remotes/orig
i
n to track all remote b
r
anches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Ju
n
io C Haman
o
git
-
st
a
t
u
s: do not mark unmerged p
a
ths
a
s
committable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Juni
o
C Ham
a
n
o
ls-files: --others should not say unmerge
d
p
a
t
h
s are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Document expat
d
ependency w
h
en u
s
ing
h
ttp-pus
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o C Ha
m
ano
Merge in http-push fir
s
t
stage
.
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
D
e
b
ian: tes
t
b
u
i
l
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Furthe
r
Debian split fi
x
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Juni
o
C Hamano
Install ascii
d
oc s
o
urces
a
s well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Hamano
Pack
a
g
e
split: D
e
bian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Simpli
f
y CF
L
AGS/DE
F
INES in Makefile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Ha
m
an
o
git-fetch: fail if specified refsp
e
c doe
s
not m
a
t
ch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C
Haman
o
Documentat
i
on: pull/clone
r
ef
m
apping clarifica
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C
Hamano
git-
f
o
rmat-pa
t
c
h
:
si
l
ly
t
ypo fi
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
test: t
4
102-apply-re
n
a
me fails
w
i
t
h
s
t
r
ict umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Haman
o
git-
c
lo
n
e
: fix l
o
cal
c
lone
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o
C
Hamano
init-d
b
::copy_file() -
u
s
e
c
o
py_fd(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
unio
C
H
amano
copy
.
c:
:
copy_
f
d() - do not l
e
a
k
file d
e
sc
r
iptor on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
D
o
c
umentati
o
n: format
-
patch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
f
orma
t
-p
a
tch: "rev1
.
.
" should mea
n
"re
v
1
.
.
HEAD"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Jun
i
o C Hama
n
o
Documentation:
git-fetch/pull updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
Docum
e
nt the -
-
no-commit
flag b
e
tter
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
Documentation: -me
r
ge an
d
-p
u
ll: describ
e
merge strategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
J
u
nio C Hama
n
o
Documentation: git-add -- do
not say "c
a
che", ad
d
examples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Juni
o
C
H
amano
g
i
t-
t
ag:
D
o not
assume t
h
e working tree root i
s
writable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C Hamano
Illus
t
ration: "
C
omm
i
t D
A
G
R
evision Naming"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C Hamano
I
l
lu
s
tr
a
t
ion:
"
Git Diff Types
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Hamano
Illustration: "Fun
d
amental Git I
n
dex Operations"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hama
n
o
git-merge
-
our
s
: make su
r
e our i
n
dex
m
a
tches
HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Add
'ours' merge s
t
rategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Ham
a
no
Add
-
-no-
c
o
m
m
it
to git-merge/git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Ham
a
no
Document --since and
-
-
u
n
til
options to rev-
p
arse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Haman
o
Be ca
r
eful when
d
e
referenc
i
ng ta
g
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Ignore '\r'
a
t the end of line in $GIT_DI
R
/
c
onf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C
Hamano
Do not fai
l
on hierarchica
l
branch nam
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Make test
-
date
b
uildable agai
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
J
u
nio C Hamano
git-
c
lone:
do
n
ot forget
t
o create origin branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
Do not put automatic
merge mes
s
age after signed-off
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Ha
m
ano
Add -
P
to the documentation head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
J
u
nio C Hamano
Do not install
backw
a
rd compatibility
l
inks anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio C
Ham
a
no
Fix const
n
ess of input
i
n mozilla-sha1/
s
ha
1
.
c
:
:SHA1_Update()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio
C
Ham
a
no
Document
the us
e
of
"
curren
t
directory" as pul
l
sour
c
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
J
un
i
o C
H
amano
Work around an R
P
M
b
ui
l
d problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next