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
Documentation: topic branches
2005-12-03
F
r
edr
i
k Kuivinen
N
e
w test c
a
se: merge
wit
h
d
i
r
ectory/file confl
i
cts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
test
-
lib
.
sh: Add
n
ew f
u
nction, test_e
x
pe
c
t
_
c
ode
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
gi
t
-merge: E
x
it with
c
ode
2
if no strat
e
gy was
a
b
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No n
a
me
d
o
cum
e
ntation: gi
t
-tag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hama
n
o
do
c
ume
n
tation: gi
t
-
bisec
t
(help
H
TML break man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No
name
do
c
u
men
t
ation: clarif
y
read-tree --reset
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
git-merge
documentatio
n
:
conflictin
g
merge lea
v
es h
i
gher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
amano
merge-one
-
file: make sure we do no
t
mismerge symbolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-one-file: make sure
we c
r
e
a
te the m
e
rge
d
file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ha
m
an
o
t3100: add l
s
-tree -t and
-d t
e
sts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-re
c
ursive: adj
u
st gi
t
-
ls
-
tree use f
o
r
the latest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ale
x
Riesen
git wr
a
pp
e
r: more careful arg
u
ment
s
t
u
f
f
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
git-merge-
o
ne-fi
l
e
:
do not
w
orry abou
t
'rmdi
r
-p' not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io
C
Hama
n
o
ls-t
r
e
e
: --nam
e
-
o
nly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o C Hamano
l
s
-
tree:
r
esurrect '-d' to m
e
an
'
show
trees only'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Linus T
o
r
valds
g
i
t-l
s
-tree: add "-t" o
p
tion to always show the tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C
H
amano
Make
f
ile: say the de
f
ault
target upfr
o
nt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
i
o
C Hamano
Documentation: describe
'-f' opt
i
on to git-f
e
tch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Timo Hirvonen
Mov
e
cou
p
le of ifdef
s
a
ft
e
r "include confi
g
.
mk"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
unio C Ha
m
ano
Merge bran
c
h
'jc
/
subdir'
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o
C Haman
o
Merge branches 'jc
/
a
pply', 'lt/ls-tr
e
e', 'lt
/
b
i
sect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi
Virtanen
Do
not
a
ttempt to access literal dirname "GIT_OBJECT_DIRECTO
R
Y"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tu
t
orial
:
adjust me
r
ge e
x
ample to recursive strat
e
gy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C Ham
a
no
merge-rec
u
r
sive:
m
a
t
ch the unme
r
ged index ent
r
y behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
Hamano
d
iff-file
s
: s
h
o
w
diffs with stage0 and un
m
erged
stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
merge-on
e
-fi
l
e
:
leave
u
nmerged index e
n
tries upon aut
o
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
dif
f
-
files: -1/-2/-3
t
o diff agains
t
unm
e
rge
d
stage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o
C Hamano
git-diff: do not turn of
f
-p/-M with
a
ny diff opt
i
ons
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C H
a
mano
Merge http://www
.
ker
n
e
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex Ries
e
n
[PATCH] Ad
d
test
s
for
g
it-mv i
n
s
u
bd
i
rectories
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 Sch
i
n
d
e
lin
[
PATCH] Make git-mv work in subdirect
o
ri
e
s, t
o
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
forma
t
-patc
h
: run dif
f
in C locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hama
n
o
format-pat
c
h:
do not abuse
3-da
s
h
marker line
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format-patch: remo
v
e
a
p
plies-to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
apply
p
atch: u
s
e
"index" l
i
nes
n
ot
"
appl
i
es-
t
o"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
a
p
pl
y
mbox
:
typofix to
e
na
b
le -m o
p
t
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
M
a
t
thi
a
s U
r
lichs
SVN
import: Use one log ca
l
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jdl@freesc
a
le
.
co
m
Fix typos and minor
f
ormat issues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Nick Hengeve
l
d
http-push cle
a
nup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Roskin
git-clone
--shared should imply --loca
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
hash-object
.
c: ty
p
e-fix
t
o squelch
c
o
mpiler warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
define die() for s
c
ripts
t
hat use i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Haman
o
verify-tag: make it operable from a s
u
bdire
c
t
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Haman
o
tag: make it o
p
erable fro
m
a
subd
i
rector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
lost-found: make it o
p
erable from a su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Ha
m
ano
branch: make it
o
pera
b
le from a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-rem
o
te
:
defi
n
e
d
ie() now we
do not use git-sh-setup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
H
amano
co
u
nt-objects: make
it operabl
e
from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
M
ak
e
the rest of co
m
mands work from a subdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
M
a
k
e networking commands to work f
r
om a subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
ls
-
tree
:
work from subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
hash-
o
bject: work within subdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
c
he
c
ko
u
t
-
i
n
d
ex: work
from subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
amano
fsck-
o
bjects: work from
subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
peek-remote: honor proxy config even
f
rom subdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
gi
t
-apply:
work from subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
working
f
rom
s
ub
d
irectory: preparation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hama
n
o
bisect: quo
t
e pa
t
hnam
e
s
for eval safety
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus T
o
r
v
a
l
d
s
bisect: limit the searchspace by
path
s
pecs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Ha
m
ano
ls-tree: match the test
to th
e
new
s
emantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
ma
n
o
ls-tree: Res
u
rrect funny
n
ame q
u
oting lost during r
e
write
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
l
s
-
tree:
f
urther
t
weaks of the rewrite
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
ls
-
tree: fu
r
ther cleanup to
p
arallel ls-files
.
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
ls-tree: m
a
jor re
w
rit
e
to d
o
pathspec
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
write_name_qu
o
ted
(
): mak
e
one o
f
the pat
h
a
c
o
u
n
t
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Haman
o
Documentation:
D
e
s
crib
e
me
r
ge operati
o
n a
bit better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ja
n
Andr
e
s
Fi
x
t
y
po in htt
p
-
p
us
h
.
c
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io
C Hamano
name-rev: fix
parent counti
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Hamano
rebase: one safet
y
net, one bugfix a
n
d one optimization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
M
e
rg
e
http:
/
/w
w
w
.
kern
e
l
.
org/pub/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
g
it-mv: quote $src in regexp
p
ro
p
erly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
config
.
c:
constness t
i
g
h
tening to av
o
i
d
c
o
mpilati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C Ha
m
ano
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 Hamano
mailin
f
o:
U
se i18n
.
commitencodi
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
ma
n
o
m
a
i
l
info
:
allo
w
-u to fall
b
a
ck
on latin1 to utf8 conv
e
rsion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
In
t
ro
d
uce i18n
.
co
m
m
itencodi
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Yann Di
r
s
on
Fix gitk thi
s
->sel
e
c
ted 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/
g
itk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
g
i
t-mv: follow
-
k request ev
e
n on failing renames
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Wei
d
endo
r
fer
Small fixes in D
o
c
u
mentatio
n
/git-mv
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
ose
f
W
e
i
dendorfer
git-mv:
fully
d
ete
c
t 'direct
o
ry moved int
o
itself'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Jos
e
f Weidendorfer
git-m
v
: keep git index consistent with file
system
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
o
sef Weid
e
ndorf
e
r
g
i
t
-
m
v: shrink usag
e
,
no usa
g
e on err
o
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
Hamano
setup_g
i
t_directory(): check
r
e
posito
r
y forma
t
v
e
rsion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
init-
d
b:
check
template and repository
f
ormat
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C H
a
mano
Check reposi
t
ory format vers
i
on in enter_repo
(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C Hamano
Repository f
o
rmat v
e
rsion check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
format-patch: output filename repo
r
ted to stdout
v
erbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
name-rev: fix off-by-one error in --stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Alexander Litvinov
gi
t
-mv is not abl
e
to handle big dir
e
ctori
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
shell
.
c: compl
a
in on insuf
f
icient arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Hamano
g
i
t
-sh-setup: move the
repos
i
t
o
ry check to a core prog
r
am
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Hamano
setup_git_directory: make sure
G
IT_DIR is a valid
r
e
p
ository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Hamano
git-var
:
m
ake it work
i
n
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Hamano
git-sh-setup: d
i
e if outs
i
de git repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
a
ma
n
o
parse-rem
o
te and ls-remot
e
clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Hamano
Pre
v
ent
"
g
i
t
-
commit -a p
a
th1 path2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
config
.
c: avo
i
d shad
o
wing global
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIFUJI Hid
e
a
k
i
.
.
.
Fi
x
a w
a
r
ning about unused val
u
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
An
d
reas
E
ricsson
c
v
si
m
por
t
: Don't let local sett
i
ngs hinder cvs
user
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next