repo.or.cz
/
git
/
vmiklos.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-merge-one: new merge world order.
2005-12-07
Ju
n
io C Hamano
git-merge-one: new m
e
rge
w
orld o
r
d
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
J
u
nio
C Ha
m
an
o
c
heckout-index: al
l
ow
c
h
ecking out from higher stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
qsort() ptrdiff_t may be l
a
rger than int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio C
Hamano
git-merge-
o
ne-file
:
r
esurre
c
t lea
d
ing path creation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio
C
Hamano
Document
a
i
ton (read
-
tree
)
: update des
c
r
i
ption
o
f
3-way
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C Hamano
Documenta
t
ion: ha
s
h-o
b
ject
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Jun
i
o C Hama
n
o
w
r
i
t
e
-
tree:
c
heck extra
arguments 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
i
t
-db:
c
h
eck extra arg
u
m
e
nts and complain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio C Hamano
hash-object: --
a
nd --hel
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
ni
o
C Ham
a
n
o
git-m
v
to
work with Pe
r
l 5
.
6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
Fix 550
1
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
Junio
C
Hamano
Clean up comp
a
tibility defin
i
tions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
unio C Hamano
c
o
nfig
.
c:
r
emove unneces
s
a
r
y heade
r
in
minimu
m
config
u
r
ation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
server-info
.
c: and two
f
unc
t
i
o
n
s
are
n
o
t
us
e
d anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ham
a
n
o
server-info
.
c: use pack_local li
k
e everybod
y
else
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
Doc
u
mentation: shared
r
epository manag
e
ment in tutorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
amano
D
o
cu
m
e
ntation:
p
ush/receive hoo
k
ref
e
rences
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io C Hamano
Documentation: git-diff asciidoc table worka
r
ound
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Do
c
um
e
ntation:
g
i
t
-mv manpage wor
k
around
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Hamano
D
ocumentation:
t
alk about pat
h
spec
in bisec
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
unio C Hamano
se
r
ve
r
-info: throw away T
c
o
m
p
u
t
ation a
s
well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o C Hamano
se
r
ver-info: stop sorting pack
s
by lates
t
d
a
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
s
e
rver-inf
o
.
c
: drop unused D line
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
sha1_file
.
c: make s
u
re packs in an altern
a
te odb i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Haman
o
git
.
c: remove exces
s
output
f
or deb
u
gg
i
n
g when comman
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
str
u
ct tr
e
e:
r
emove unus
e
d field "parent"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Hamano
D
o
cumentation: re
b
ase does not
use ch
e
rry-pick any
m
ore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio
C
Hamano
s
h
o
w
-bran
c
h: allow g
l
ob p
a
ttern
to name b
r
anche
s
to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio
C
Hamano
git
.
c: two fix
e
s, gitseten
v
type an
d
o
f
f-by-one e
r
ror
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio
C
Hamano
compat/se
t
e
nv: do not fr
e
e wh
a
t w
e
fe
d
putenv(3)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Hamano
[PATCH] d
a
emon
.
c
and
pa
t
h
.
ente
r
_repo(): reva
m
p p
a
th
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
unio
C Hamano
doc
u
mentatio
n
:
g
it-bi
s
e
c
t
(help HTML b
r
eak man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ha
m
ano
git-me
r
ge
documentati
o
n: confl
i
ctin
g
merge leaves higher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-one-file: make
s
ure
we do not
m
ismerge symbo
l
ic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-
o
n
e
-fil
e
: make sure we c
r
e
a
te
the merged fi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
i
o
C Ha
m
ano
t
3
100: add ls-tree -t and -d tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-recurs
i
ve: adjust git-
l
s
-tre
e
use for the l
a
test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
i
o
C Haman
o
git-merge
-
one-file
:
do
n
ot worry about 'rmd
i
r -p' no
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
Ham
a
no
ls-tree: --n
a
m
e
-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls-tree
:
resurrect '-d' to mean 'show tre
e
s only'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
C
H
a
mano
Makefile: say the defau
l
t
targ
e
t
u
p
f
ront
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o C Hamano
Do
c
umentation: describe '-f' option
t
o git-
f
etch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
M
e
r
g
e bra
n
ch 'jc/subd
i
r'
commit
|
commitdiff
|
tree
2005-11-30
Junio C
Hamano
Merge
b
ranches 'jc/a
p
ply
'
, 'lt/ls-t
r
ee', '
l
t/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tutorial:
a
djust merg
e
example to recursive strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
amano
mer
g
e-recursive: m
a
tch the un
m
erged
i
n
d
ex en
t
ry behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
Hamano
diff-files: show diffs with stage
0
and unmerged stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Hama
n
o
git-
d
iff: do not turn off -
p
/-M with
any di
f
f op
t
io
n
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
Merge http://www
.
ker
n
el
.
or
g
/pub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Haman
o
for
m
at-
p
a
t
ch: run diff in C locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format-patch:
d
o n
o
t abus
e
3-d
a
sh mark
e
r li
n
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format-patch: remove applies-to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
H
a
mano
applypatch: use
"ind
e
x" lin
e
s not "applies-to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C
H
am
a
no
applymbox: t
y
pofix
t
o enab
l
e -m
o
ptio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
has
h
-object
.
c: type-f
i
x to
s
quelch compiler
w
ar
n
ings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hama
n
o
define di
e
() f
o
r
scripts that us
e
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
v
erify-tag
:
make it operabl
e
from a sub
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
tag: make it operable from a su
b
d
irector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hama
n
o
lost-found:
m
a
k
e
it
o
perable from a subdirec
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
bran
c
h: mak
e
it operable from
a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-remote: d
e
f
i
ne die() now we do not use
g
it-sh-setup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
count-objects
:
m
a
ke it operable from
a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
an
o
Make
th
e
rest
o
f commands work from a subd
i
r
e
ct
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
Make networ
k
ing commands
t
o wo
r
k from
a subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Haman
o
ls-
t
ree: work from subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hama
n
o
hash-objec
t
:
w
ork with
i
n
su
b
direc
t
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
ama
n
o
checko
u
t-index:
w
ork from subd
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
fsck-objects: work from subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
a
no
peek-r
e
mot
e
:
hon
o
r pro
x
y config
even from s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
git-appl
y
: work fr
o
m subdir
e
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
workin
g
from sub
d
irecto
r
y: pr
e
pa
r
at
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
ma
n
o
b
i
sect: quote p
a
thnames
f
or
e
v
al safe
t
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
ma
n
o
ls-tree: match the
t
est
to the new semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
ls-t
r
ee
:
R
esurrect funny
na
m
e
q
u
o
ting
l
ost during rewrite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
write_name_
q
uote
d
(): make
one of the path a count
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
a
mano
Do
c
u
m
e
ntati
o
n: Describe merge operat
i
on a bit better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
am
a
no
name-rev: fix
p
ar
e
nt counting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
n
o
r
e
b
ase
:
one safety net, one bugfix and one optimizatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o
C Hamano
Merg
e
htt
p
://www
.
kernel
.
org/
p
u
b/sc
m
/gitk/g
i
tk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hama
n
o
git
-
mv: quote $src in rege
x
p prope
r
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
[
P
ATC
H
]
gitk
:
U
s
e
i18n
.
comm
i
te
n
coding
configur
a
t
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
amano
config
.
c
: constness tightening
t
o
avo
i
d
c
o
mpi
l
at
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Hamano
maili
n
fo: Do
n
ot use -u=<encod
i
ng>; sa
y
--encoding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
a
mano
m
a
ilinfo:
U
se i18n
.
commitencoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
mailin
f
o: allow -u to fall back
o
n
latin1 to utf8 co
n
ve
r
sion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Introduce i18n
.
commitencoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
H
amano
M
erge http://www
.
k
e
r
n
el
.
org/pub/sc
m
/
g
itk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Junio C Haman
o
setu
p
_
g
it_dire
c
to
r
y():
c
he
c
k repo
s
itor
y
format v
e
rs
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
io C
H
amano
init-db: ch
e
ck
t
e
m
pla
t
e
and
repository format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C
H
amano
Check
r
epository format version i
n
en
t
er_repo
(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
R
epository for
m
at version
c
heck
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
format-patch: output f
i
lename re
p
orte
d
to stdout verbati
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
name-rev:
f
ix of
f
-by-on
e
error
i
n --stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C
Ham
a
no
s
h
e
ll
.
c:
c
omplain on ins
u
ffici
e
n
t
arg
u
men
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Hamano
g
i
t-sh-setup
:
move the r
e
pository check to
a
c
o
re pr
o
g
r
am
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Hamano
setup_git_directory: make sure GI
T
_DIR is a valid repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
g
it-var:
m
ake it work in su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
g
it-sh-setup:
d
i
e
if outsi
d
e
g
i
t repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
par
s
e-rem
o
te an
d
ls-remote clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Haman
o
P
reve
n
t
"
git-commit -a p
a
th1
p
ath2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next