repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t/t6022: a new test for renaming merge.
2005-12-11
Junio C H
a
mano
t/t6022: a new test for r
e
naming m
e
rge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Jun
i
o
C Hama
n
o
merg
e
-recursive
:
cleanup s
e
tIndexStages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Juni
o
C Hamano
merge-recursive: l
e
a
ve un
m
erged
entries in th
e
index
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Jun
i
o
C
H
amano
format-
p
atch:
u
s
e sam
e
numbe
r
of d
i
gits in num
b
ers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Ju
n
io C Hama
n
o
t0
0
00: c
a
tch tr
i
vial pil
o
t errors
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
J
u
n
i
o C H
a
m
a
no
t330
0
: funny na
m
e test
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Daniel Barkalow
Allow saving an obje
c
t
from
a
pip
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-10
Junio C Hamano
Link Everyda
y
GIT t
o
main doc
u
mentation tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-10
Junio C Haman
o
Everyday
GIT wit
h
20 commands
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-10
Junio
C Ha
m
ano
Use
G
IT
_
EXEC_
P
ATH explicitly
for initial git-ini
t
-db
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
Alex Riesen
use "git init
-
db"
i
n tests
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
Junio C Hamano
git-prune: never
lo
s
e objects rea
c
hable fro
m
ou
r
r
e
f
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
Ju
n
io C
H
a
mano
qsort():
p
trdiff_t
m
ay
b
e
l
arger tha
n
i
n
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
Juni
o
C Hamano
Documentation: gi
t
-prune
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Ni
k
olai Weib
u
ll
D
ocumentatio
n
/git-read-tree
.
txt: A
d
d --rese
t
to
SYNOPSIS
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Niko
l
ai Weibull
Document
a
ti
o
n/gi
t
-tag
.
txt: Fi
x
the o
r
der of s
e
c
ti
o
ns
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
N
iko
l
ai We
i
bull
Document
a
ti
o
n
/
g
it-update-se
r
ver-info
.
txt
:
Add -f
a
l
ia
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Nikolai We
i
bull
Docu
m
e
n
tation/g
i
t-http-fetc
h
.
txt: Documen
t
the c
o
mmit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Nikolai Weibu
l
l
Docu
m
enta
t
i
o
n/git-repack
.
txt
:
Add -l an
d
-n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Nikolai
Weib
u
ll
Doc
u
mentation/gi
t
-ls-r
e
mo
t
e
.
txt: Add -h
and -
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Nikolai We
i
bull
Do
c
umentation
/
gi
t
-f
o
rm
a
t-patc
h
.
tx
t
:
A
dd --
s
i
gnoff,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Nikola
i
Weibull
Add docume
n
tation for t
h
e
--topo
-
order option
t
o git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Nik
o
la
i
Weibull
Add docume
n
tation for git
-
revert and git-cherry-pick
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
N
i
kolai Weibull
Documen
t
ation/gi
t
-cherry-pick: Add --replay and
-
-
no
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
N
i
ko
l
ai We
i
bu
l
l
Document
a
t
i
o
n/git-cvsimport
.
txt: Fix a slight glitch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Niko
l
a
i Weibull
Document
a
tion/git-veri
f
y-pack
.
txt: a
d
ded documentation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Nikolai Weib
u
ll
Documentat
i
on/git-commit
.
txt: Add
l
ong options and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Nikolai Weibull
Us
e
uniform description for the
'
--
'
option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Nik
o
lai W
e
ibu
l
l
Fi
x
t
h
e descript
i
on of
-
-utf8 and --keep to git-am
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Nikolai Weibull
D
o
c
ument the --non-
e
m
p
ty c
o
mmand-lin
e
o
ption to
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
J
u
nio C
Haman
o
show-br
a
nch: comment typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hama
n
o
Documen
t
a
tion: r
e
cursive is
the
default str
a
tegy these
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio
C
H
a
mano
Mak
e
sure we
u
s
e compat/su
b
p
rocess
.
py with Python 2
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Dan
i
el
Barkalow
C
lean up file desc
r
i
p
to
r
s when calling hooks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
ref
s
.
c:
make sure leading directories exist before
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
J
u
n
io C
H
amano
Documentation(tutorial):
adjust
merge example to t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
Do
c
umentation(cvs-migrat
i
on)
:
minor
c
leanups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Jun
i
o C Hamano
Docu
m
entat
i
on(glossary): minor formatting clean
-
ups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C H
a
m
a
no
Documen
t
atio
n
: git
.
html/git
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
J
unio C H
a
ma
n
o
M
er
g
e http
:
//www
.
kernel
.
org/
p
ub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-12-07
Junio C Haman
o
update-in
d
e
x: allo
w
--index-info to add higher stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Ju
n
io C
H
am
a
no
gi
t
-merge-one:
n
ew merge wor
l
d order
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
checkout-inde
x
: a
l
low
c
he
c
k
ing out from hi
g
h
er
stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Ja
s
on Riedy
Use pr
i
n
t
f rather tha
n
echo -n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
qsort(
)
ptrdiff_
t
may be larger than int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Jason Ri
e
dy
[
P
AT
C
H] Initial
A
IX
p
o
r
tabilit
y
fix
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hama
n
o
git-
m
erge-one
-
fil
e
: resurr
e
ct leading path creati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C
Hamano
Documen
t
a
i
to
n
(r
e
ad-tree
)
: update descript
i
on of 3-
w
a
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C Hamano
Documentation:
h
ash-object
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
write
-
tree: c
h
eck extra
a
rguments and die b
u
t be a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
i
o
C Hamano
i
n
it-db: check e
x
tra
a
rgum
e
nts and complain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
h
a
sh
-
o
b
ject: --
and --help
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
o
n Loeliger
A
d
d
e
d documentation
for fe
w
missing opti
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio
C Hama
n
o
git-mv t
o
work wit
h
Perl 5
.
6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
un
i
o C
H
amano
Fix
5501
t
e
st
Signed-off-by:
Junio C Hamano
<junkio@twinsun.com>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ham
a
no
Cle
a
n up
c
ompa
t
ibility defin
i
t
i
ons
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ja
s
on
Riedy
[PATCH
]
Docume
n
t
c
onfig
.
ma
k
in
INST
A
LL
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C H
a
ma
n
o
co
n
f
i
g
.
c: remove un
n
e
c
e
ssary header
i
n
m
inimum configur
a
t
io
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Haman
o
server-info
.
c:
a
n
d t
w
o fu
n
c
t
ions
a
re not u
s
ed any
m
o
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
server-info
.
c
:
use pack_local like
everyb
o
dy el
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Docum
e
ntat
i
o
n:
s
hared reposito
r
y
m
an
a
gement in
t
ut
o
ria
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
Documenta
t
ion:
p
u
sh
/
receive hook referen
c
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o C Ha
m
ano
Documentation: git-di
f
f asciidoc tabl
e
w
o
rkar
o
und
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Hamano
D
ocumenta
t
ion
:
git-mv manpage
w
o
r
karound
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documen
t
ati
o
n: tal
k
about path
s
pec i
n
bisect
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C Hamano
server-info: t
h
row aw
a
y T c
o
mputation as
w
ell
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C H
a
mano
s
e
r
v
er-
i
nfo: stop sorting p
a
cks by
latest date
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
unio
C
Hamano
s
erver-inf
o
.
c: drop
un
u
sed D line
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
n
io C Ha
m
ano
sha1_file
.
c: make
s
ure p
a
c
k
s i
n
an
al
t
ernate
odb is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
g
it
.
c: rem
o
ve excess output
for d
e
bugging when co
m
mand
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
ni
o
C Hamano
struct
t
ree: remove unused field "parent"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Hamano
Documentation: rebase does not use cher
r
y-
p
ick
anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Petr
B
audis
Doc
u
ment the --(no-
)
edit swi
t
ch
o
f
git
-
r
evert a
n
d
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
unio C Ha
m
ano
s
h
ow
-
bra
n
ch: allow
glob pattern to
name bra
n
ches to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Pe
t
r
B
a
udi
s
Update the
gi
t
-ls-tree doc
u
me
n
tation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio
C
Hamano
git
.
c: two
f
ixes, gitsete
n
v t
y
pe and off-by-o
n
e
erro
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
J
u
nio C Ham
a
n
o
com
p
at/setenv:
do
n
ot free what
w
e
fed putenv(
3
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Daniel
Barkalow
Warn when send-pack does nothing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C
Ha
m
an
o
[PATCH
]
daemon
.
c
and
p
at
h
.
enter_repo
(
): reva
m
p p
a
th
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
H
.
P
e
ter Anv
i
n
A few
more options for git-cat-file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Jason Ried
y
Add compat/setenv
.
c
, use
i
n git
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivinen
New te
s
t case:
Criss-cr
o
ss merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivinen
N
ew tes
t
case: merge with dire
c
t
ory/file conflicts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik
K
u
ivine
n
test-l
i
b
.
sh:
Add
n
e
w fun
c
tion, test_ex
p
e
ct_code
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
git-merge:
Exit
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
d
o
c
u
m
e
ntation: git-t
a
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Hamano
documen
t
ation:
g
it-bi
s
ect (help HTML break
man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No name
documentation
:
clarify
read-t
r
ee --r
e
set
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C Hamano
gi
t
-merge docume
n
tation
:
c
onflicting
merge
leav
e
s
h
igher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
unio
C
Hamano
m
erge-one-file:
make
sure we do not mismer
g
e
s
ymbolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C Hamano
merge
-
one-file: make
s
ure
we crea
t
e the m
e
rge
d
file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
t310
0
: add
l
s-
t
ree -t and -d tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C Hamano
merge-recurs
i
v
e
: adjust git-
l
s-tree u
s
e f
o
r the latest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
A
l
e
x
Riese
n
git wrap
p
er: more carefu
l
argume
n
t stuffing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ham
a
n
o
g
it-mer
g
e-one
-
file: do not w
o
rry about
'rmd
i
r
-
p
'
not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hama
n
o
ls-tree: --name-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
u
n
io C
Hamano
ls-tree: resu
r
rec
t
'-d' to mean
'
show trees
o
n
ly'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Linus Torvalds
gi
t
-ls-
t
ree: add "-t"
opti
o
n to a
l
ways show the tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o C Hamano
Make
f
ile: say
th
e
default targe
t
upfront
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio
C Hamano
Documen
t
ation:
describe
'
-f' opti
o
n to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next