repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
New test case: merge with directory/file conflicts
2005-12-03
Fredrik Kuivinen
New t
e
st case: merg
e
with directo
r
y/file con
f
li
c
ts
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivi
n
en
test-lib
.
sh: Ad
d
new function,
t
est_e
x
pec
t
_code
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivin
e
n
git-merge: Exit wi
t
h co
d
e
2 if
n
o
strategy wa
s
able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
N
o n
a
me
documenta
t
ion: gi
t
-tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
docum
e
n
t
ation: git-bise
c
t (help HTML break m
a
n)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
documentati
o
n: clar
i
fy read-tree
-
-re
s
e
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hama
n
o
git
-
merge docum
e
ntat
i
o
n:
c
onflicting merge
l
eav
e
s higher
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
i
o
C Hamano
merge-one-file:
m
ake
s
ure we
d
o not mismerge symb
o
lic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C
H
amano
mer
g
e-one-file:
m
ake sure we create 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 tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
m
e
rge-recursive: adjust
git-ls-tree
u
se
for the lates
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Alex Ri
e
s
e
n
git wra
p
per: more care
f
u
l
a
rgument stuffing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C Hamano
g
i
t-merge-one-file: do n
o
t worry about 'rmdi
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: -
-
na
m
e-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
C Hamano
ls-tree: re
s
ur
r
ect '-d' to me
a
n
's
h
o
w
trees only'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Linus Torval
d
s
git
-
ls-
t
r
e
e: add "-t" option to a
l
way
s
show t
h
e
tree
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Haman
o
Makefile:
say
the
d
efault
target upfront
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
Docu
m
entation
:
des
c
r
i
b
e '-
f
' option to git-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Timo
Hirvonen
Move coupl
e
of i
f
defs after "inclu
d
e config
.
mk"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C
Hamano
Merge branch 'jc/s
u
bdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio
C
Hamano
Merge
b
ranc
h
es 'j
c
/
a
pply', '
l
t/ls-tree', 'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi
V
irtan
e
n
Do
not att
e
mpt to access l
i
ter
a
l
d
irname "
G
IT_OBJECT_DIRECTORY
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tutorial:
adjust
m
e
rge exa
m
ple t
o
recursive s
t
rategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C H
a
man
o
merge-recursive: match
the unmerged
index
ent
r
y behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Hamano
diff-fi
l
e
s: show
diff
s
with stage0 and unmerged
s
tage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus
T
o
rvalds
merge-one-file: leave unmerged index ent
r
ies upon aut
o
m
e
rge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus Tor
v
alds
d
i
ff-files
:
-1/-2/-3 t
o
diff agai
n
st unme
r
ged stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
git-diff: do not tu
r
n off
-p/-M with any
d
iff options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Me
r
ge http://www
.
kernel
.
org/pub
/
scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex Riesen
[PA
T
C
H] A
d
d
te
s
t
s
for g
i
t-mv in sub
d
ire
c
t
o
rie
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Joh
a
nne
s
S
chin
d
elin
[PATCH]
M
ake
g
i
t-mv wo
r
k in s
u
bd
i
rectori
e
s
, to
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
format-p
a
tch: run
di
f
f i
n
C locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
format-patch: do
n
ot abuse 3-dash marker line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
am
a
no
format-pat
c
h: remove applie
s
-to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
applypa
t
ch: use "index"
l
i
nes
n
ot "applies-t
o
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
ma
n
o
app
l
ymbox
:
typofix
t
o
ena
b
le
-m
o
p
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matthias Urlichs
SVN i
m
port: Use
o
ne
log
c
a
l
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
jdl@freescale
.
c
om
Fi
x
typos and minor
format i
s
sues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Nick H
e
ngevel
d
http-push cle
a
n
up
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Roskin
git-clone --
s
hared shoul
d
imply
-
-
local
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
hash-objec
t
.
c: typ
e
-fix
t
o sq
u
e
lc
h
compile
r
warnings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
define die() f
o
r scripts
t
ha
t
u
s
e
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
veri
f
y-
t
ag: make it opera
b
le from a subdirector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
tag: make
it operable from a
s
ubdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
a
man
o
lost-fou
n
d: m
a
ke it operable from
a s
u
bdire
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C Hamano
branch:
m
ake
it op
e
rable fr
o
m a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
ls-re
m
ote: defi
n
e
d
i
e
() n
o
w
we do not use git-
s
h
-setup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
c
o
unt-ob
j
ects:
make i
t
operable from a subdir
e
c
to
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
H
amano
Make netwo
r
king
commands to wo
r
k from a s
u
bdire
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C Ham
a
no
ls-tree: work from
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
hash
-
object:
w
o
rk withi
n
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
amano
checkout
-
in
d
e
x
: work from subdirect
o
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
fsck-objects
:
work fro
m
subdirec
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
peek
-
remote: honor proxy config even from sub
d
ir
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Ha
m
a
no
git-apply: work from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
working
from subdirector
y
: preparation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
bi
s
e
ct:
quote pathnames for eval safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Lin
u
s
To
r
valds
bisec
t
: limit the
searchspace by pathspecs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
uni
o
C Hamano
ls-tree: match the test to the new semanti
c
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
ls-
t
r
ee:
R
esurrect funny n
a
me quoting
l
ost during rewrite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torval
d
s
ls-tree: further t
w
eaks
o
f
t
he rewrite
commit
|
commitdiff
|
tree
2005-11-29
Li
n
us Torvalds
ls-
t
ree: further cleanup
t
o
p
a
r
allel ls-file
s
.
commit
|
commitdiff
|
tree
2005-11-29
Linus Torv
a
lds
ls-tree
:
maj
o
r rewrite to
do pathspec
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
write
_
n
a
m
e
_
q
uoted
(
): make one of the
pa
t
h
a counted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C Hamano
D
o
c
umentatio
n
: Describe merge
o
per
a
tion a
bi
t
bet
t
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
a
n A
n
dres
Fix
typo i
n
htt
p
-pus
h
.
c
commit
|
commitdiff
|
tree
2005-11-29
J
unio C H
a
mano
nam
e
-rev: fix parent counting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
H
a
m
ano
reba
s
e:
o
ne safety net,
one bugfi
x
an
d
one optimizati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
i
o C Ha
m
ano
Merge h
t
tp:/
/
www
.
kern
e
l
.
org/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
git-mv: quo
t
e
$
src in regexp
p
roperly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C Hamano
config
.
c: constness tightening to a
v
oid co
m
pilati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mai
l
info
:
Do not use
-
u
=<e
n
coding>; say -
-
e
n
coding
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
no
m
a
ilinfo: Use
i
1
8
n
.
c
ommiten
c
o
di
n
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o
C Hamano
mailinfo: a
l
l
o
w -u to fall
b
ac
k
on la
t
in1 to utf8 conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C Hamano
I
n
troduce i18n
.
commitencoding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Ya
n
n Dirson
F
i
x gitk this->selecte
d
diffs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ham
a
n
o
Merge h
t
tp://ww
w
.
kernel
.
org/pub/scm
/
gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-27
Josef Weiden
d
o
rfer
g
it-mv: follow
-k r
e
quest even on failing re
n
ames
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
osef Weidend
o
rfe
r
Small fixes in
Documentation/git-mv
.
txt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jose
f
Wei
d
endorfer
git-mv: f
u
lly detect 'directory
m
ov
e
d into itself'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jose
f
Wei
d
endorfer
git-mv:
keep git index consistent with
fi
l
e system
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
osef Weidendorf
e
r
git-mv: shri
n
k u
s
a
ge, n
o
usage o
n
error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
io C
H
ama
n
o
setup_git_directory(): check repository fo
r
mat version
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jun
i
o C Hamano
init-db: check t
e
mplate and r
e
posi
t
o
ry form
a
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Juni
o
C
H
aman
o
C
h
e
ck reposit
o
ry format ve
r
sion in enter_
r
e
p
o()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Rep
o
sitory forma
t
version
che
c
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C
Hama
n
o
format-pat
c
h: output filena
m
e
r
e
ported
to stdout
verbatim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
name-rev: fix off-
b
y-one error i
n
--stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Ale
x
ander Litvinov
git-mv is no
t
able to handle big directories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hama
n
o
shell
.
c: complain on insufficient a
r
guments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C H
a
mano
gi
t
-
s
h-setup: move the reposito
r
y c
h
e
c
k
t
o
a
core pr
o
gram
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o
C Hamano
se
t
up
_
git_dire
c
tory:
make sure GIT
_
D
IR
is a valid re
p
ository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io C H
a
mano
git-var: mak
e
it work in subdirec
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
amano
g
i
t
-sh-setup: d
i
e
i
f outsid
e
git re
p
ositor
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Hama
n
o
parse-remote
and ls-remot
e
clean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
unio C Hamano
Preve
n
t "g
i
t-
c
ommit -a p
a
t
h1 path2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Ham
a
no
config
.
c: avoid
shadowing global
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIFUJI H
i
deaki
.
.
.
Fix a
warning a
b
out unused v
a
lue
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Andreas Er
i
css
o
n
cv
s
impo
r
t: Don't let l
o
cal
s
ettings hinder cvs us
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next