repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: recursive is the default strategy these days.
2005-12-08
Juni
o
C H
a
ma
n
o
Docum
e
ntat
i
on: recursive is t
h
e
de
f
a
ult
s
trategy these
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
J
u
nio
C
Hama
n
o
Make sur
e
we use
c
ompat/su
b
process
.
p
y
wit
h
Python 2
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
D
aniel Bar
k
alow
Clean up file descriptors when calling hoo
k
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
refs
.
c
: make sure leadin
g
directories exist
befor
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
Documenta
t
ion(tutori
a
l)
:
a
d
just merge example to the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Juni
o
C
Ha
m
a
n
o
D
o
cument
a
tion(cvs-
m
igr
a
tion): mi
n
or cl
e
anups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
Document
a
tion(
g
lossary):
minor f
o
rmatting clean-
u
ps
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
J
un
i
o C
H
amano
Documentation: git
.
htm
l
/git
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Juni
o
C
H
amano
Merge http
:
//www
.
k
e
r
nel
.
org/
p
u
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-12-07
Junio C Ha
m
ano
update-index:
a
ll
o
w --index-in
f
o to
a
dd higher stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Ham
a
no
git-m
e
r
ge-one: new me
r
ge world
o
rder
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C H
a
mano
checkout-in
d
ex: allo
w
ch
e
cking
o
u
t fro
m
higher stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Jason Riedy
Use
printf rather than echo -
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
qsort(
)
ptr
d
iff_t
m
ay be large
r
than int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Jason Riedy
[PATCH] Initial AI
X
portabi
l
ity f
i
xes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C H
a
ma
n
o
git-merge-one-file: r
e
surrect le
a
ding
path creation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C Hamano
Documentaiton (r
e
ad-tr
e
e): update
d
esc
r
iption of 3-way
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C
H
amano
D
ocum
e
ntatio
n
: hash-object
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
w
r
ite-tr
e
e: check extr
a
a
rguments a
n
d die but be a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
i
n
it-db:
c
heck extra
arguments and complain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
ni
o
C Hamano
h
ash-object:
-
- and --help
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Jon
L
oeliger
Ad
d
ed documentation for
f
e
w
m
i
ssi
n
g
o
pt
i
ons
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio C
H
amano
git-mv to work with Perl 5
.
6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Jun
i
o
C Hama
n
o
F
i
x 5501 test
Signed-off-by:
Junio C Hamano
<junkio@twinsun.com>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o C Hamano
C
l
e
a
n up compatibility defi
n
i
t
ion
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jas
o
n
R
ie
d
y
[PATC
H
] Docum
e
nt confi
g
.
m
ak
i
n INS
T
A
L
L
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ham
a
no
confi
g
.
c: remov
e
unnec
e
ssa
r
y he
a
d
er in minim
u
m configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hamano
s
e
rve
r
-inf
o
.
c:
a
nd t
w
o
func
t
i
ons are
n
o
t used
anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
server-i
n
fo
.
c:
u
se pack_local like everybody el
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Do
c
umentation
:
shared reposi
t
ory mana
g
emen
t
in tu
t
orial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Do
c
umentation: pus
h
/receive hook references
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Ham
a
no
Documenta
t
ion:
g
it-diff asciidoc
t
able wor
k
aroun
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o C Hamano
Do
c
umentat
i
on: git-mv manpag
e
wor
k
around
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o C
Hamano
D
ocumenta
t
io
n
: tal
k
ab
o
ut pathspec in
b
isect
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
server-info: throw
a
way T com
p
uta
t
ion as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ha
m
ano
server-info: sto
p
sorting packs by la
t
est date
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
s
e
r
ver-info
.
c:
drop unused D lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
sha1_file
.
c: make sure pack
s
i
n
an alternate od
b
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C
Hamano
git
.
c: remove exc
e
ss output f
o
r debugging w
h
e
n
command
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
amano
struct t
r
ee: remove unused f
i
eld "
p
arent
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io
C Haman
o
Docu
m
en
t
ation
:
re
b
ase
d
oes not use ch
e
rry
-
pick
any
m
o
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Petr Baudis
Document t
h
e --(
n
o-)edit switch of
g
it-revert and gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o C Hamano
show-bra
n
ch:
a
llow g
l
ob pattern t
o
name b
r
anches to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Pe
t
r B
a
ud
i
s
Updat
e
t
he git
-
l
s-tree docum
e
ntation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Ham
a
no
git
.
c: t
w
o fixes, gitsetenv
type an
d
off-by-one error
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio
C Hamano
compat/setenv: do not free what w
e
fed p
u
tenv(3)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Daniel Barka
l
ow
Wa
r
n when
send-pack does
nothing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio
C
Hamano
[PATCH] daemon
.
c and pat
h
.
e
n
ter_repo(): re
v
amp path
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
H
.
P
eter
An
v
in
A
f
ew
m
ore opti
o
ns for git-cat-file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Jas
o
n Riedy
A
dd co
m
pat/setenv
.
c, use in git
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
n
e
n
N
e
w test case: Criss-cr
o
ss
m
erge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
N
ew test case:
m
erge wi
t
h directory
/
file conflicts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuivin
e
n
test-lib
.
sh: Ad
d
new function, test_expect_
c
ode
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivinen
git-merge: Ex
i
t with code 2 if no strategy was
a
ble
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No name
docu
m
entation: git
-
tag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C Hamano
d
o
cumentat
i
on:
git
-
bis
e
ct
(
help HTM
L
b
r
eak man
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No name
documentation: clar
i
fy read-tree --reset
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Hamano
g
it-merge documenta
t
ion:
c
onfl
i
c
t
ing merge leaves higher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C Hamano
mer
g
e
-one-file: ma
k
e sur
e
w
e
do
n
o
t mismerge symbol
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C Hamano
mer
g
e
-one-f
i
le: make sure w
e
create the
m
erged fi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C Hamano
t
3100
:
add ls-
t
ree -
t
and -d
test
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Hamano
merge-recu
r
s
i
ve:
ad
j
u
st git-ls-tree use for the late
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
A
l
ex Riesen
gi
t
wrapp
e
r: more car
e
ful argument st
u
ffing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
Haman
o
g
it-m
e
rge-one-fi
l
e
:
d
o not worry
about 'rm
d
ir
-
p'
not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o
C
Hamano
ls-tree: --name-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
u
n
i
o
C H
a
mano
l
s-tree: r
e
s
u
rre
c
t '-d' to mean 'show
t
rees only
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Lin
u
s T
o
rvald
s
gi
t
-l
s
-tree
:
add "-t"
o
ption to a
l
ways show the tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C
H
a
mano
M
a
k
efile: s
a
y the default target
u
pfr
o
nt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C
Ha
m
ano
Do
c
u
m
entation: describ
e
'-
f
' opt
i
on to
g
i
t-fe
t
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Timo H
i
rvonen
Move coupl
e
of ifdefs afte
r
"include confi
g
.
mk"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merge branch 'jc
/
sub
d
ir'
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Hama
n
o
Merg
e
branches 'j
c
/
a
pply'
,
'lt
/
ls-tree', 'lt
/
b
i
sect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tom
m
i Vir
t
a
n
e
n
Do n
o
t attempt to access liter
a
l dirnam
e
"GIT_OB
J
EC
T
_
D
IR
E
CTORY"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C Hamano
Tutorial: adjust merge example to recur
s
ive s
t
rategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
merge-recursive: mat
c
h the un
m
e
r
g
e
d index en
t
ry behaviou
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
unio C Hamano
diff-files: sh
o
w di
f
f
s
with stage0 and un
m
e
r
ged stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Lin
u
s
T
o
rvalds
merge-one-fi
l
e:
l
eave unmer
g
ed index entries
up
o
n
a
u
tomerge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus
T
o
rvalds
di
f
f
-files:
-
1/-2/
-
3
t
o
diff a
g
ainst un
m
e
rg
e
d
s
tage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
unio C Hama
n
o
git
-
d
i
f
f: do not
turn o
f
f
-
p
/-
M
with
any diff opt
i
ons
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
M
erg
e
http://www
.
k
erne
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Ale
x
Ri
e
sen
[PAT
C
H] Add test
s
for git-mv in subdi
r
ectories
Junio C Hamano
, Sat, Nov 26, 2005 03:45:52 +0100:
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Johannes Schindelin
[PATCH] Mak
e
g
i
t
-
mv work in subdirectories, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
format-patc
h
:
run diff in C loc
a
le
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hama
n
o
format-patch: do
n
ot abuse 3
-
dash marker l
i
ne
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
f
ormat-patch: remove ap
p
lies-to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Ha
m
a
n
o
applypatch: use "index" line
s
not "
a
pplies-
t
o"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
applymbox:
typof
i
x to en
a
b
l
e -m
option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ma
t
thias Urlichs
SV
N
import:
Use o
n
e
l
og
c
a
l
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jdl@freescal
e
.
com
Fix typ
o
s and minor f
o
r
m
a
t
i
ssues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Nick Hengeveld
http-push cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pavel
Roskin
g
i
t-c
l
one --sh
a
red s
h
o
u
ld i
m
ply --
l
o
c
al
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Ha
m
ano
hash
-
objec
t
.
c: type-fix to squelch com
p
iler w
a
rnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
m
ano
define die
(
) for sc
r
ipt
s
that
u
se i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
verify-tag
:
make it operable from a subdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
tag: make it operable from a subdirect
o
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C
H
amano
lost-found: mak
e
it operable
f
rom a subd
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
b
r
anch: make i
t
operable from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C Hamano
ls-remote: def
i
ne
die(
)
now we do not use git-sh-setup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
c
ount-obj
e
cts: ma
k
e it operable f
r
om a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
Make t
h
e re
s
t
of commands work fr
o
m a subdir
e
c
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next