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
merge-one-file: make sure we do not mismerge symbolic links.
2005-12-02
Junio C Hamano
m
er
g
e-o
n
e-file: m
a
ke sure we do not mismerge symbolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
n
i
o C Hamano
merge-
o
ne-fil
e
:
make sure
w
e
c
reate the merge
d
file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io
C
Hamano
t31
0
0: add
l
s-t
r
ee -t and -d
tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
m
erg
e
-
r
e
c
u
rs
i
v
e: adjust git-l
s
-tree
use
f
or the latest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Alex Ries
e
n
g
it
wrapper:
m
ore c
a
r
e
ful argum
e
n
t stuffing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C Ha
m
a
no
git-merge-one-fil
e
: do not worry about 'rmdi
r
-
p
' not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
unio C Haman
o
ls-tree: --name-onl
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
Haman
o
ls-t
r
ee: resurrect
'
-
d
'
to mean 'sho
w
trees only'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Linus Torvalds
git-ls-tr
e
e: add "-
t
"
o
ption
t
o always show
t
he tr
e
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
Makefile: say the default target upfront
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
Documentation: desc
r
ib
e
'-f
'
o
ption
to git-fet
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Timo Hirvonen
Move couple
o
f ifde
f
s
after
"
include co
n
fig
.
mk"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merge br
a
nch
'jc/subdir
'
commit
|
commitdiff
|
tree
2005-11-30
J
unio C Hamano
Merge branches 'jc/ap
p
ly
'
, 'lt/ls-tree',
'
lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi Virtanen
D
o
n
o
t attem
p
t to access literal d
i
rn
a
me "GIT_
O
BJ
E
CT_DIRECTORY"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tutorial: adjus
t
me
r
ge example
to rec
u
rsive st
r
ategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C H
a
m
a
n
o
merge-recursive: match the un
m
erged ind
e
x entry behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
di
f
f-f
i
l
e
s: show diff
s
with stag
e
0 and u
n
merged stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus T
o
rval
d
s
merge-one-file: le
a
ve u
n
merged in
d
ex entries upon automer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Li
n
u
s
T
orvalds
di
f
f-files: -1/-2/-3
t
o
d
i
f
f
a
gain
s
t unm
e
r
g
ed stag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io
C
Hamano
g
i
t
-
diff: do not turn off -p/-M with any diff options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Ham
a
no
Merge http://www
.
kernel
.
org/pub/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2005-11-29
Alex Riesen
[PATC
H
]
A
dd t
e
sts for
g
i
t
-mv in s
u
bdirec
t
o
r
ies
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
J
o
hannes
Sch
i
ndelin
[PATCH] M
a
ke g
i
t-mv work i
n
subd
i
rec
t
o
ries,
t
o
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Haman
o
format-pa
t
c
h
: run diff in C
l
ocale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format-patch:
d
o no
t
ab
u
se 3-das
h
marker l
i
ne
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C
Hamano
f
o
rma
t
-
p
a
t
ch: r
e
m
o
v
e applies-
t
o
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C Hamano
apply
p
atch: use "index" lines not "appli
e
s-to
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
a
ppl
y
m
box: ty
p
ofix to
e
nable -m option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Mat
t
hias
U
rlichs
SVN import: Use one log ca
l
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jdl@freescale
.
com
Fix typos and minor format i
s
sues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ni
c
k Hen
g
e
v
eld
http-push cle
a
n
up
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
P
av
e
l R
o
sk
i
n
g
it-clon
e
--shared shoul
d
imply --local
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o C Hamano
h
ash-object
.
c: t
y
pe-f
i
x
to
s
quel
c
h compiler warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
defi
n
e
d
i
e() for scri
p
ts
t
hat use
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
ver
i
f
y
-tag:
m
a
ke i
t
operable from
a
s
u
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Ham
a
no
t
ag: make it operab
l
e
from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
lost-fo
u
n
d: ma
k
e it ope
r
able from a subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
H
a
m
ano
branch: make
i
t
o
perable
f
rom a
s
ubdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
ls-remo
t
e: defi
n
e die(
)
now we do not use g
i
t-sh
-
set
u
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ha
m
a
no
cou
n
t-obj
e
cts: m
a
ke it
o
perable fro
m
a sub
d
irecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Make the rest of commands
w
ork from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Make netw
o
r
king
com
m
ands to work from a sub
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
ls-tree: work from
s
ubdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
hash-object
:
work within subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C Hamano
check
o
u
t
-index: work from subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C H
a
mano
fs
c
k-objects: work from
subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
peek-remote:
h
onor proxy
config e
v
en from su
b
direc
t
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
g
i
t
-
ap
p
ly: wo
r
k from
su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
working from subdire
c
tory: preparation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
an
o
bisect: quote pathnames for eval safet
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
bisect: limit the s
e
archspace by pathsp
e
cs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io
C
Hama
n
o
l
s
-tree:
m
atch the test to the new
s
emantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
ls-t
r
ee: Resurrect
f
unny name
quo
t
ing
l
ost dur
i
ng rewrite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Lin
u
s Torvald
s
ls-tree: further tweaks of the rewrite
commit
|
commitdiff
|
tree
2005-11-29
L
inus Torvald
s
ls-tre
e
:
further cleanup to parallel
l
s-files
.
commit
|
commitdiff
|
tree
2005-11-29
Li
n
us Torvalds
ls-tre
e
: major
r
e
write to do pathspec
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Ha
m
an
o
write_name_quote
d
(): make one of the
pa
t
h a counted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C Hamano
Document
a
t
i
o
n
: Describe mer
g
e
oper
a
t
ion a bit bett
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jan An
d
re
s
Fix ty
p
o in http-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
name-re
v
: fix
pare
n
t counting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
mano
rebase: one safety net, one bugfix and
o
ne o
p
ti
m
izat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
un
i
o C Haman
o
Merge
h
ttp://www
.
kernel
.
org/
p
u
b
/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
git
-
mv:
quote $sr
c
in regexp properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
c
onfig
.
c: cons
t
ness tighteni
n
g to avoid compilation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Ha
m
ano
mailinf
o
: Do
n
ot
use -u=<encoding>; say --encod
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
mailin
f
o: Use i1
8
n
.
commitenco
d
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
Haman
o
mai
l
in
f
o: a
l
low -u to fal
l
b
ack on latin1 t
o
utf
8
conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Introd
u
ce i18n
.
commitencoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Yann
Dirson
Fix gitk this->selected
d
iffs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Merge http://www
.
kerne
l
.
org/pub/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-27
Jo
s
ef
W
eidendorfer
gi
t
-mv: foll
o
w -
k
request even on faili
n
g
rena
m
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef
Weiden
d
orfer
Small fixe
s
in Documenta
t
ion/
g
it-
m
v
.
t
xt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef We
i
d
e
ndorfer
gi
t
-mv:
fully detect 'directory move
d
i
nt
o
it
s
elf'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
g
i
t-mv: keep git
i
nde
x
consistent
w
it
h
f
i
le s
y
stem
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
osef We
i
d
e
ndor
f
er
git-m
v
: shrin
k
u
sage, n
o
us
a
ge on er
r
or
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hama
n
o
setup_git_directory(): c
h
eck r
e
pository
f
or
m
at versi
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
init-db:
ch
e
ck template
a
n
d reposito
r
y for
m
at
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
n
i
o C Hamano
Che
c
k repository format version in enter_r
e
p
o()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Reposi
t
ory format
v
ersion check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C Hamano
format-patch: outp
u
t fil
e
name reported to stdout ver
b
atim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Ha
m
ano
na
m
e-
r
ev:
f
ix off-
b
y-one error in
--st
d
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Alexander Litvinov
g
it-mv is not able to
h
andle big direc
t
or
i
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Jun
i
o C Hamano
she
l
l
.
c: c
o
mplain on
i
nsufficient arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o
C Ham
a
no
g
i
t-sh-se
t
up: mo
v
e the repository c
h
e
c
k to a co
r
e pr
o
gram
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
a
m
ano
setup_g
i
t_di
r
ectory: ma
k
e
sure GIT_DIR i
s
a valid
rep
o
sitory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C H
a
mano
gi
t
-
v
ar: make it work in
subdire
c
to
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Hamano
git
-
sh-se
t
up: die if o
u
tside git re
p
o
s
itory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Hamano
par
s
e-remote
a
n
d
ls-remote cle
a
n-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
ama
n
o
Prevent "git-commit -a path1
p
a
th2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Haman
o
co
n
fig
.
c: avoid shadowing glob
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIFUJI
H
i
d
eaki
.
.
.
F
ix a
warni
n
g about
unused value
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Andreas Eric
s
son
cvsimport: Don
'
t let local
s
ettings hinder cvs
user
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Johanne
s
Schindelin
Rename git-co
n
f
i
g-set to g
i
t
-
repo-config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Juni
o
C
H
ama
n
o
diff-t
r
ee: teach
s
ingle-comm
i
t diff-t
r
e
e to honour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
unio C
H
am
a
no
T
each update-index to read fr
o
m ls
-
tr
e
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C
Ha
m
a
n
o
g
i
t
-
revert: make --
e
dit
defaul
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Linus Torva
l
ds
Allow editing of a revert-messa
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Josef Weidendorfer
Fix git-mv for mov
i
ng directories wit
h
1 file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio
C
Hamano
git-merg
e
:
make r
e
c
ursive the d
e
fault strategy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next