repo.or.cz
/
git
/
dscho.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: Criss-cross merge
2005-12-03
Fred
r
i
k Kuivinen
New
test case: Cri
s
s-cross me
r
ge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivin
e
n
N
e
w te
s
t
cas
e
: merg
e
with direc
t
ory/file conf
l
icts
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuivinen
test
-
l
ib
.
sh: Add
n
ew fun
c
t
ion, test_expe
c
t_code
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edr
i
k Kuivin
e
n
git-merge: Exit wit
h
code 2 if
no strategy was
a
ble
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
documentation: git-tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C H
a
man
o
documenta
t
i
on: git
-
b
i
s
e
ct (he
l
p HT
M
L
b
r
eak ma
n
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No na
m
e
documentation:
clarify read-tree --re
s
e
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
H
aman
o
g
i
t-merge documentation: conflic
t
ing merge lea
v
es higher
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C Haman
o
merge-one-file: make su
r
e we do no
t
mismerge symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
un
i
o C Hamano
merge-one-file: ma
k
e
s
ure w
e
crea
t
e
t
he
m
erged file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
t31
0
0: add ls-tr
e
e -t an
d
-d
tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
m
erg
e
-rec
u
rsive: adjust
git-ls-
t
ree use for th
e
l
a
test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Alex Riesen
git wrapper
:
more careful argument stuffing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Hamano
git-
m
e
r
g
e
-one-fi
l
e: do not wor
r
y ab
o
u
t
'rmdir
-
p'
not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io C
H
amano
ls-tr
e
e: --name
-
on
l
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io
C Hamano
ls-tree: r
e
surrect '-
d
'
to mean 'show trees o
n
ly'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Linus Torvald
s
g
i
t-ls-tree: add "-t" o
p
t
io
n
to
a
lways show the t
r
ee
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o C
Hamano
Makefile: say the d
e
fault
t
arget
upfront
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Ha
m
an
o
Do
c
um
e
n
t
ation: describe '-f' option to git-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Timo Hirvone
n
Move coup
l
e of
ifdefs af
t
er
"
include config
.
mk"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merge b
r
anch '
j
c
/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Hamano
Merge branches
'jc
/
apply',
'
lt
/
ls
-
t
r
e
e
', 'lt/bise
c
t
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
To
m
mi Virtanen
Do not attempt
to access li
t
era
l
dirname "GIT_
O
BJECT_
D
IRECTORY"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C Ham
a
no
Tut
o
rial: adjust merge example
to r
e
cu
r
s
iv
e
stra
t
egy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
unio
C Hamano
merge-r
e
c
u
rsive: match th
e
unmerged inde
x
entry be
h
avi
o
u
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
d
i
ff-
f
iles: show diffs with stage0
an
d
un
m
erged st
a
ge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
merge
-
on
e
-file: leave
u
nmerged
index entries upon aut
o
merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
L
inus Torvald
s
dif
f
-files:
-
1/-2
/
-3
to diff against unmerged stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
i
o
C Hamano
git-diff: do not turn
o
ff -p/-M with
a
ny diff o
p
tions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
Merge http://www
.
kerne
l
.
org/pub/scm/
g
itk/
g
itk
commit
|
commitdiff
|
tree
2005-11-29
A
lex R
i
e
s
en
[P
A
TCH] Add t
e
sts for git-mv in subdirectorie
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Johannes Schindelin
[PATCH]
M
ake git
-
mv work in subdi
r
e
ctories, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Ham
a
n
o
for
m
at-pat
c
h: run dif
f
in C locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
forma
t
-
p
atc
h
: do not a
b
use 3-dash
m
a
rker line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
fo
r
mat-patch: remove applies-
t
o
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C H
a
mano
appl
y
p
a
tch:
u
se "index" lines not "
a
pplies-to"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
applymbox:
typofix to enable -m
o
p
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matthias Urlichs
SVN impor
t
: Use one log
c
all
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
jd
l
@freesc
a
le
.
com
Fix t
y
pos
and
m
inor fo
r
m
at issues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Nick Hengeveld
h
ttp-push
c
leanup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Ros
k
in
g
i
t-clone --shared shoul
d
imp
l
y
--local
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C
H
a
m
ano
h
ash
-
objec
t
.
c: type-
f
i
x to
squelch compi
l
e
r warnings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
d
efine d
i
e() for
s
cripts that use it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
verif
y
-tag: ma
k
e it operable from a su
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C
Hamano
t
a
g
:
make it ope
r
able f
r
om a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C Haman
o
lost-f
o
un
d
: make it operable from a su
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
branch:
m
ak
e
it oper
a
bl
e
from a
s
ubdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
ls
-
remote: d
e
fine
die()
n
ow 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
cou
n
t-objects: make
it
o
pe
r
able
f
rom
a
su
b
d
i
r
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
Make the rest
o
f
c
o
m
mands work from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Ha
m
ano
M
a
k
e netw
o
r
k
i
n
g commands to work f
r
om a s
u
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
ls-tree: work from su
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
ma
n
o
hash-ob
j
ect: work
within sub
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
ch
e
ckout-index: work fr
o
m subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
fsck-objects: w
o
rk f
r
om subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
peek-re
m
ote: honor proxy config even
f
r
om subdir
e
ct
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
git-appl
y
: wor
k
f
rom subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
worki
n
g from
su
b
directory: p
r
epa
r
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
b
isect: qu
o
t
e
pat
h
nam
e
s for
eval saf
e
ty
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus
T
orvalds
b
i
s
ect: li
m
it th
e
searchspace by path
s
pecs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-tre
e
:
m
atch the t
e
st
t
o
the new semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
a
mano
ls-tree: Resurrect
f
unny name quoting lost during rewrite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvald
s
ls-
t
ree: further tweaks of the rewrit
e
commit
|
commitdiff
|
tree
2005-11-29
Linus
Torvalds
ls-
t
ree: further cleanup to pa
r
allel ls-files
.
commit
|
commitdiff
|
tree
2005-11-29
Linus Tor
v
alds
ls-t
r
ee: ma
j
or rewrit
e
to do p
a
thsp
e
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
write
_
name_quot
e
d
()
:
make
on
e
of the path a counted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
ni
o
C Hamano
D
ocumentation:
D
escribe merge oper
a
tion a bi
t
better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
a
n Andr
e
s
Fix typo in
ht
t
p-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
name
-
rev:
f
ix
p
arent 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 bugfix a
n
d one
optimizat
i
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
i
o C Hamano
Merge
http:/
/
www
.
kern
e
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Hamano
git-mv: qu
o
te $src in regexp pro
p
erl
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
ano
con
f
ig
.
c: con
s
tn
e
ss
tig
h
ten
i
ng t
o
avoid compila
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
a
m
ano
mailinfo: Do
n
ot use -u=
<
encoding>; s
a
y
-
-encoding
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo: Use i1
8
n
.
commite
n
c
o
ding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C Hamano
mailinfo: a
l
low
-
u
to fall ba
c
k on lati
n
1
t
o
u
tf8
conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C Hamano
Introduce i
1
8n
.
c
o
mmite
n
c
oding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Yann Dirs
o
n
Fi
x
gitk t
h
is->selected dif
f
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
H
amano
M
e
rge htt
p
:
//www
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Jos
e
f
Weiden
d
orfer
git-mv: follow -k request even on failing r
e
names
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
o
sef Weide
n
dor
f
er
Small fixes in Documentat
i
on/git-mv
.
t
x
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weide
n
dorfe
r
git-mv: fully detect
'd
i
rect
o
ry move
d
into itself'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef W
e
id
e
ndorfer
git-mv: keep
g
it index consi
s
tent wi
t
h file
system
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jose
f
Weidendorfer
g
it-mv:
s
hrink usage,
n
o usa
g
e on error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Haman
o
set
u
p_git_directory()
:
c
h
eck repository form
a
t
ver
s
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Juni
o
C Haman
o
i
n
it-db: check template
a
nd reposito
r
y
form
a
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
unio C
H
aman
o
Check
reposito
r
y format version in enter_repo()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Reposi
t
ory form
a
t
version check
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Juni
o
C H
a
mano
format-patch:
o
u
tp
u
t
filename reported t
o
s
tdout verba
t
im
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C
Hamano
n
a
me
-
rev: fix o
f
f-by-one error in --stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Alexander Litvi
n
ov
git-mv i
s
n
ot abl
e
to
ha
n
dle b
i
g dire
c
tories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Jun
i
o
C
Hamano
shell
.
c
:
compl
a
in on insufficient
a
rgume
n
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
amano
git-sh-setup: mo
v
e
the repository che
c
k to a
c
ore progr
a
m
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
am
a
no
s
e
t
up_git_direct
o
ry: ma
k
e sur
e
GIT_DI
R
is
a
valid reposi
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Hamano
git-var: make it wo
r
k i
n
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o
C
H
amano
git-sh-setup: die if ou
t
side git re
p
ository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Ha
m
ano
parse-remo
t
e and ls-remote clean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio
C
Hamano
Prevent "git-commi
t
-a pat
h
1
path2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
config
.
c: avoid
s
hadowing global
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIFUJI Hideaki
.
.
.
Fix a warning about unus
e
d value
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next