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-one-file: make sure we create the merged file.
2005-12-02
Ju
n
io C Hamano
merge-one-file: make sure we c
r
eate the merged file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
t3100: add ls-tree -
t
and -d tes
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C
H
amano
merge-recursive: adjust git-ls-
t
ree use for t
h
e la
t
est
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
A
lex
R
iesen
git wrapper: m
o
re careful argum
e
nt
s
tuff
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Haman
o
git-merge-one-fil
e
: do
not
w
o
rry ab
o
ut 'rmdir -p' not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
C Ha
m
ano
ls-tree: --name-
o
nl
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io
C
H
a
mano
ls-tree
:
res
u
rrec
t
'
-
d' to mean 'show trees only
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
L
inu
s
Torva
l
ds
git-
l
s-tree: add "-t" option to always s
h
ow
t
he tre
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C Hamano
Makefile: say the default target upf
r
ont
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o
C
Hama
n
o
Documen
t
ation:
descri
b
e
'-f'
option to git-fet
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Timo Hirvo
n
en
Move c
o
upl
e
of ifdefs after "includ
e
c
onfig
.
mk"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merg
e
branch 'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C Hamano
M
e
rge bran
c
hes 'jc/apply',
'
lt/ls-
t
ree', 'lt/b
i
sect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi Virtanen
Do not attemp
t
to access lit
e
r
a
l dirname "GIT_OBJE
C
T_DIREC
T
O
RY"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tutorial:
a
dj
u
st mer
g
e ex
a
mple to r
e
cursive strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o
C
H
amano
me
r
ge-re
c
ursive: match the u
n
m
e
rged index entry behaviou
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
a
mano
dif
f
-fil
e
s:
s
how diffs
w
it
h
s
t
age0
and unmerged
s
tage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Lin
u
s Torvalds
mer
g
e-one-
f
ile:
l
eav
e
unmerged index entries
u
pon
a
utomerg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus T
o
r
valds
dif
f
-fi
l
es: -1/-2/-3 to d
i
ff against unmerged stage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C Hamano
gi
t
-
d
iff: do not turn off -p/-M with any
dif
f
opti
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
m
a
no
Merge
http://www
.
kernel
.
org/pub/scm/git
k
/g
i
tk
commit
|
commitdiff
|
tree
2005-11-29
Alex Riesen
[PATC
H
]
A
dd tests for
g
it
-
mv in subdire
c
tories
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 S
c
h
indelin
[PATC
H
]
Make
g
it-mv wo
r
k
i
n
su
b
directories, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
H
a
man
o
for
m
at-pa
t
ch: r
u
n diff in C
l
o
cale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
format-patch: d
o
not abuse 3-
d
as
h
marker line
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
m
ano
fo
r
m
a
t-p
a
tch: r
e
move applies-to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
n
o
apply
p
atch: use
"index" lines not
"
ap
p
lies
-
to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io
C
Hamano
applym
b
ox: typofix
t
o
e
nabl
e
-m option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Matt
h
ias Urlichs
SVN
i
m
port
:
Use one
l
og call
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jdl
@
frees
c
a
le
.
com
Fix typos and minor form
a
t iss
u
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Nick H
e
n
g
e
vel
d
http-push cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Ros
k
in
git-cl
o
n
e --shared should
i
m
ply --local
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
hash-object
.
c: type-fix to squ
e
l
c
h compiler w
a
r
n
ings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Haman
o
d
e
fine die() for scri
p
ts that use it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ve
r
ify-
t
ag: mak
e
it operable
from
a
subdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
tag: mak
e
it operable from a subd
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
los
t
-f
o
und: make it operable
f
ro
m
a su
b
d
i
r
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C
Hamano
b
r
anch:
make it o
p
e
r
able from a s
u
bdi
r
e
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
n
o
l
s
-rem
o
te: define 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
count-obj
e
cts: make it
o
p
e
rable from a sub
d
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C
H
ama
n
o
Make
t
he rest
of com
m
ands work
f
r
om a subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
m
ano
Make
n
etworking comman
d
s to w
o
rk
from a subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hama
n
o
ls-t
r
ee: work
fro
m
subdire
c
t
o
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
hash-object:
w
or
k
within
s
ub
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
chec
k
o
ut-inde
x
:
w
o
r
k
f
rom subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
a
m
ano
fsck-
o
bjects:
work
from s
u
bdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
pe
e
k
-remote: honor proxy config ev
e
n fro
m
su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
git-apply: work from
s
ubdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
working from subdirectory:
p
repar
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
Hamano
bisec
t
: quote pathnam
e
s for eva
l
safety
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
bisect: lim
i
t the searchspace by pathspecs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-tree: mat
c
h the test to th
e
new
s
ema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
ls-tr
e
e:
Resurrect
f
unny name quotin
g
lost during rewrit
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Lin
u
s Torvalds
ls-tree
:
furt
h
er twea
k
s of the rewrite
commit
|
commitdiff
|
tree
2005-11-29
Li
n
us Torva
l
d
s
ls-tree: furth
e
r clean
u
p
to
parallel ls-files
.
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
ls-tree: m
a
jo
r
rewrite to do pathspe
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
wri
t
e_
n
a
m
e_quote
d
()
:
make one of the path a counted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ha
m
ano
Docum
e
ntati
o
n: Describe
merge opera
t
ion
a
bi
t
bett
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jan Andres
Fix
t
ypo in http-pus
h
.
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
n
a
me-rev: fix parent count
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
am
a
no
r
e
b
ase: on
e
safe
t
y net, one bugf
i
x an
d
one
optimizatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
M
e
rge http://www
.
ker
n
el
.
o
r
g/pub/
s
cm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
mano
git-mv: quote $src in rege
x
p p
r
o
p
erly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
no
con
f
ig
.
c: constness tight
e
ning to
a
v
o
id compilation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo: Do not use -u=<encoding>; say --encoding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Haman
o
m
a
i
linfo: Use i18n
.
comm
i
tencoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Hamano
mailin
f
o
:
a
l
low -u to fal
l
b
ack on l
a
t
i
n1 to
utf8
c
o
nv
e
rsion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Hamano
I
n
troduce i18n
.
c
o
mmiten
c
oding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Yann D
i
rson
Fix git
k
this->selec
t
ed
diffs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Merge http://www
.
kernel
.
org/pub/scm/gi
t
k/g
i
tk
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendo
r
fer
git-m
v
: f
o
ll
o
w -k req
u
est
e
ven on failing renam
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
o
s
e
f Weidendorfer
Smal
l
fixes in Docum
e
n
tatio
n
/gi
t
-m
v
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Jos
e
f
Weidendorfer
g
it-mv: fu
l
ly detect 'directory moved into itself
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef
W
eide
n
dorfer
git-
m
v:
keep git index consis
t
ent
w
ith file s
y
s
t
em
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
osef Weiden
d
orfer
g
i
t
-
mv: s
h
r
i
n
k
u
s
age, no usage
o
n
e
rror
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C Ha
m
an
o
setup_git_director
y
():
ch
e
ck re
p
osi
t
ory format ver
s
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C
H
amano
init
-
db: check temp
l
ate and re
p
ository
f
o
rmat
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Ch
e
c
k
r
eposit
o
r
y format version in e
n
ter_repo()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
H
ama
n
o
Repo
s
itory format version che
c
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
unio
C
Ham
a
no
format
-
patch: output file
n
ame reported to stdout
verbati
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
u
nio C Hama
n
o
na
m
e-rev: fix off-by-one error in --stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
A
l
e
x
ander
L
itvinov
git-mv is not able to h
a
ndle big director
i
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
shel
l
.
c: complain
on insufficie
n
t argu
m
ents
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Hamano
git
-
sh-setup: m
o
v
e the
r
e
positor
y
check to a core program
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io C Hamano
s
e
tup
_
git
_
direc
t
ory
:
make
sure GIT_DI
R
i
s
a
v
alid r
e
pository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
gi
t
-va
r
: make it
w
ork in subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Ha
m
an
o
git-sh-setup: di
e
if outside gi
t
repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o C H
a
mano
parse-remote and ls-remote clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Hamano
P
re
v
ent "git-commit -a
path1 path2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C
Ham
a
no
config
.
c: avoid shad
o
wing global
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
YOSH
I
FUJI Hideaki
.
.
.
Fix a warn
i
ng about unused val
u
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
And
r
eas Eri
c
sson
cvsimport: Don't let local settings hinde
r
c
v
s
u
s
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Johannes Schindelin
Re
n
ame gi
t
-co
n
fig-set to
g
i
t
-repo-config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Ha
m
an
o
dif
f
-
t
ree: teach single-co
m
mit diff-
t
ree t
o
honour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C
Hamano
T
each update-index
to
read from ls-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hama
n
o
git-revert: make -
-
edit default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Linus To
r
valds
Allow e
d
iting
of a rev
e
rt-message
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Josef Weiden
d
o
rfe
r
Fix git-mv for moving direc
t
ories with 1
f
il
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
u
nio C
Hamano
g
i
t-merge: make recursive the
default str
a
tegy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Ha
m
a
no
p
a
ck-redundant: t
y
p
e cleanups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next