repo.or.cz
/
git
/
jrn.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
J
u
nio C Hama
n
o
M
e
r
ge branc
h
'tojunio' of http://loc
k
e
.
cat
a
lyst
.
n
e
t
.
.
.
commit
|
commitdiff
|
tree
2005-11-17
J
un
i
o C
H
a
m
a
no
Add approxidate t
e
st calls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Jun
i
o C Ha
m
ano
t
e
sts: binary
di
f
f application
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C Hamano
dif
f
:
--ful
l
-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio
C Hamano
ap
p
ly:
allow
-
binar
y
-replacemen
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-17
Junio C
H
amano
git-am: --resolved
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Junio C
Ha
m
ano
gi
t
-
a
pply: fail if a patch c
a
nnot be applied
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-16
Junio C Hamano
git wrap
p
er: basic fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hama
n
o
sha1_fi
l
e
.
c::add_pack
e
d_gi
t
(): fix typ
e
mismatch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Ju
n
io C Hamano
dif
f
:
make default
r
e
name detec
t
ion limit configurable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hama
n
o
Documentation: d
o
not blindly run '
c
a
t
'
.
git
/
HEAD,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Junio C Hamano
U
pdate topo-order test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-15
Juni
o
C Hama
n
o
apply:
fix
binary patch detection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Ham
a
no
M
erge branch
'
s
vnup'
o
f h
t
tp:/
/
netz
.
smurf
.
noris
.
de
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio
C
Hamano
S
epara
t
e LDFLAGS and CFLAGS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-14
Junio C Hamano
M
er
g
e branch 'svnup' o
f
h
t
tp://n
e
tz
.
smurf
.
noris
.
de
.
.
.
commit
|
commitdiff
|
tree
2005-11-13
Jun
i
o C
Ha
m
a
no
Rename lost+fo
u
nd to lost-
f
ound
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-13
Junio
C
Hamano
D
ebian: b
u
ild
-
depen
d
on libexp
a
t
-d
e
v
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
H
amano
Ignore built git-lost+found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C Hama
n
o
D
ocumentation: asciidoc s
o
urces are u
t
f-
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio
C
Hamano
Rena
m
e
.
g
it
/
l
o
s
t
+found to
.
g
it/lost-found
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Juni
o
C Hamano
g
i
t-lost+fou
n
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o C Hamano
g
i
t-pr
u
n
e
: prune
r
edu
n
dant packs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
J
uni
o
C
Hamano
merge-one-file: use emp
t
y- o
r
common-base
c
ondintionally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C
H
aman
o
Docume
n
t
ati
o
n: git-apply --n
o
-add
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Jun
i
o C
Hamano
mer
g
e-one-file: use c
o
mmon as base, i
n
stead
o
f emptiness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-12
Junio C Hamano
merge with /dev/null as
base,
i
n
stead of pun
t
ing O
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
unio C
H
amano
INSTALL: duplicate python requirements from Ma
k
e
f
ile
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ham
a
no
Merg
e
b
ranches 'jc/sb'
and 'j
c
/
m
b'
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
t12
0
0: us
e
--topo-order
t
o
keep
t
he show-branch out
p
ut
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
u
nio
C
Hamano
Fully
d
etect unin
t
eresting commit
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C
Hamano
git-show-branc
h
:
tighten merge-base comput
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C Hama
n
o
A
d
d test case f
o
r
merge-base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Hamano
merge
-
bas
e
:
av
o
id unneces
s
ary post
p
roc
e
ssing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C
H
amano
m
e
rge-base
:
ful
l
y contam
i
nate the well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio C Ha
m
ano
RPM: arch submodule
n
eeds tla
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Ju
n
io C Hamano
oct
o
pus: do not do AND'ed me
r
g
e
base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C Haman
o
Ad
d
--
p
retty=fuller
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
J
unio C Hamano
Do not
lose
autho
r
name i
n
formati
o
n to l
o
cale go
t
chas
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-11
Junio
C Hamano
Documen
t
ation: "host:path/to/repo" is git native over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C
Hamano
Mak
e
g
i
t-
r
ecursive the default
st
r
ategy for git-pull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C
Hamano
Use '
m
erge-ba
s
e --all' whe
r
e ap
p
licable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-10
Junio C
Hamano
Merge branc
h
'ho
l
d/svn'
commit
|
commitdiff
|
tree
2005-11-10
Junio C
Hamano
M
erge branch
'
hold/rpm'
commit
|
commitdiff
|
tree
2005-11-09
Junio
C Hamano
git-apply:
d
o n
o
t fail
o
n binary dif
f
when no
t
applying
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-09
J
unio
C
Hamano
Update INST
A
LL
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
J
unio
C
Hamano
Clean
b
uild annoyance
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C Hamano
Fix a coupl
e
of obvious
and insignificant typo
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Juni
o
C
H
a
mano
git-am: do
n
o
t
lose already
e
dited final-commit when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio
C
H
a
mano
D
e
b
ia
n
: packaging u
p
dates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C
Hamano
Tutorial: do not use 'gi
t
r
e
solve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Docume
n
t
a
tion: f
i
x dependency generatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hamano
Ignore more generated
files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io C Ham
a
no
F
i
x
d
ocumentation d
e
pendency generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Ju
n
io C Ha
m
ano
Do
c
umentation: asciidoc for
m
a
t
t
ing fix
for git-cv
s
exportc
o
mm
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-08
Junio C Hama
n
o
D
o not fail on h
i
era
r
chical
t
agnames
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio
C
Hamano
R
ecover
d
r
opp
e
d
+
x bit f
r
om git-pull
.
s
h
b
y
ac
c
ident
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
u
n
io
C
Ham
a
n
o
D
o
cumentation:
t
alk ab
o
u
t
guts of merge in tutorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
Se
t
up
re
m
otes/origi
n
t
o track all remo
t
e branch
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
unio C Hamano
git-status: do not m
a
rk unm
e
rg
e
d
p
ath
s
as committab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hama
n
o
ls-
f
iles:
-
-
o
t
h
ers shoul
d
not say unmerge
d
pa
t
hs
are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio C Hamano
Docume
n
t expat d
e
pendency w
h
en
using http-push
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
Hamano
M
e
rge
in http-p
u
sh first stage
.
commit
|
commitdiff
|
tree
2005-11-06
Junio C
H
amano
Debi
a
n: tes
t
b
uild
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Further Debian s
p
lit fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Instal
l
asciidoc sou
r
ces as
w
ell
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C
Hamano
Package split:
Debia
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Simplify CFLAG
S
/
DEFIN
E
S in Ma
k
ef
i
le
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hama
n
o
g
it-
f
etch: fail if specifi
e
d ref
s
pec
d
oes n
o
t mat
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C Hamano
Docum
e
n
tat
i
on:
pull/clone ref
m
apping clarification
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ju
n
io C Haman
o
g
i
t-format
-
patch: s
i
lly typo
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio
C
H
amano
test: t4102-apply-rename fa
i
ls wi
t
h s
t
rict
umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
git-cl
o
ne: fix local c
l
one
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
init
-
db::copy_fi
l
e() - u
s
e
copy_fd
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hama
n
o
copy
.
c::copy_fd() -
d
o n
o
t
le
a
k file descriptor on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Ju
n
io
C
Haman
o
Docu
m
entation:
f
o
rmat-patch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
u
ni
o
C Hamano
forma
t
-p
a
tch: "rev1
.
.
" should mean "rev1
.
.
HEAD"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
D
o
cu
m
ent
a
tion
:
g
it
-
fetch/p
u
ll upd
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
D
o
cument th
e
--no-commit flag better
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Haman
o
Docum
e
ntation: -
m
erge
and -pull: describe merge
s
trategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
J
u
ni
o
C Hamano
Documentation: git-add -- d
o
not say "cache", add examples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C Hamano
git-tag: Do not as
s
u
m
e the wo
r
king tree root i
s
writable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Illustration: "Co
m
mit DAG Re
v
ision Naming
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Illustration
:
"G
i
t Diff Types"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Ha
m
ano
Illustration: "Fundame
n
tal Git Index Oper
a
tions
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io
C Hamano
git
-
merge-ours: mak
e
sure
our in
d
ex matches HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Hamano
Add 'ours' merge strateg
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Hamano
Add --no-commit to gi
t
-mer
g
e
/
git
-
p
ull
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C H
a
m
ano
Docu
m
e
n
t --sin
c
e
and
--until optio
n
s to r
e
v-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Jun
i
o C Hamano
Be car
e
f
ul when
d
e
refe
r
e
ncing tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Hamano
Ignore '\
r
'
at
t
h
e
end of
l
in
e
in
$
GIT_DIR/con
f
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ha
m
ano
Do
n
ot f
a
il
o
n hi
e
rarchic
a
l b
r
a
n
c
h
names
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ha
m
ano
Make test-date bui
l
dable again
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Jun
i
o C Hamano
git-clone: do not fo
r
get to create origin
b
ranch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Ham
a
no
Do not put auto
m
atic
merge messa
g
e
a
fter signe
d
-off
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
J
unio C Hamano
A
dd -P to the
docum
e
ntatio
n
head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
Do no
t
insta
l
l
b
ackward co
m
p
atibil
i
ty links
a
nymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Junio C Ha
m
ano
Fix co
n
stness of input in mozilla-sha1/sha1
.
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 use of
"
c
u
rrent di
r
ect
o
ry" as pul
l
source
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Juni
o
C Hamano
Wo
r
k
a
r
o
und
a
n RPM build problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next