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
F
r
edrik Kuivinen
Ne
w
test case: Criss-cross merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
i
nen
Ne
w
test
c
a
se: m
e
rge
w
ith directo
r
y/fil
e
conflicts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivine
n
test-lib
.
sh: Add new funct
i
on, test_expect_code
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
drik Kuivinen
g
it-merge: Exit with cod
e
2 if no strategy was
a
ble
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No
n
ame
documentation
:
git-tag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
uni
o
C Hamano
documentation:
g
it-bisect (
h
elp HTML br
e
ak
man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No
name
docu
m
entation: clarify read-tree --reset
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C Hamano
git-
m
erge documentatio
n
: conflic
t
ing m
e
rge leaves higher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C
Hamano
mer
g
e-
o
n
e
-file: mak
e
sure we do
n
ot mismerge sym
b
ol
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o
C
H
amano
me
r
ge-one-fil
e
: make
sur
e
we cr
e
ate the merged
fil
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io
C
Hama
n
o
t3
1
00:
a
dd ls-tree -t and -d test
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C Hamano
me
r
ge-recursive: adjust
g
it-ls-tree us
e
for
t
he latest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
A
l
ex Riesen
git w
r
apper: more
c
areful argument stuffing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ha
m
ano
git-merg
e
-one
-
file: do not
w
orry abo
u
t 'rmdir -p' not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io C Hamano
l
s
-tree: --
n
ame-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls-tree: res
u
rrect '-d' to
m
ean 'show trees o
n
ly'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Linus Torvalds
git-ls-tr
e
e: add "-t" option to always sho
w
the tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o C Hamano
Makefile: say the
default target upfro
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o C Ham
a
no
Docume
n
ta
t
ion: d
e
scribe
'
-f' opti
o
n t
o
git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Timo Hirvonen
Move couple of
ifdefs aft
e
r "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
'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C H
a
mano
Merg
e
b
r
anches
'
jc/apply', 'lt/ls-tree', 'lt/bi
s
ect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
To
m
mi Virtanen
Do not at
t
empt
t
o ac
c
ess lit
e
ral di
r
nam
e
"GIT_OBJECT_DIRECT
O
RY"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tutorial
:
adjus
t
merge e
x
ample to
r
ecursive st
r
ategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio
C Hamano
merge-recursive: match the unmerg
e
d ind
e
x e
n
try
b
e
havio
u
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C H
a
mano
diff-files: sho
w
diffs with stage0 a
n
d unmerged stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Lin
u
s To
r
va
l
ds
m
e
r
ge-one-file
:
lea
v
e unme
r
ged index entrie
s
upon autom
e
r
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Tor
v
a
lds
diff-files: -
1
/-2/-3
t
o
di
f
f against
u
nmerged
s
tage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
git-
d
i
ff: do not tur
n
off -p/-M wi
t
h
any d
i
f
f options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C
Ha
m
ano
M
e
r
ge http://www
.
kernel
.
org/pub/
s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex
R
i
e
s
e
n
[PATCH] Add
t
ests for g
i
t
-
mv in su
b
direc
t
ories
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 Schinde
l
in
[PATCH] M
a
k
e gi
t
-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 Ha
m
ano
fo
r
mat-p
a
tch: run
diff
i
n C loc
a
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C H
a
mano
fo
r
m
a
t-patch: do not abuse 3-das
h
marker line
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
m
ano
format-patch:
r
emove
a
pplies-t
o
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
applyp
a
tch:
use "index
"
lines not
"applies
-
t
o"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
a
pplymbox:
t
y
p
ofix to e
n
able -m option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Matthias Urlic
h
s
SVN import: Use one l
o
g cal
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
j
dl@freescale
.
com
Fix typ
o
s and minor format is
s
u
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Nick Hengeveld
http-push cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pa
v
el Roskin
git
-
clone
--shar
e
d should imply --
l
oca
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
hash-object
.
c: type-
f
ix to s
q
uelch
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 scripts that use
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
verify-tag:
m
ake it
o
perable from a subdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
ta
g
:
m
ake it
o
perable from a
sub
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
lost-f
o
und: make it operable from a s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
b
r
anch: mak
e
i
t
operable f
r
om a subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
ls-rem
o
te: define die() now we do not
u
se git-sh-setup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
a
m
a
no
count-
o
bje
c
ts: mak
e
i
t operabl
e
fro
m
a su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
M
a
k
e the
r
est of commands
w
ork
f
rom a s
u
bdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
M
ake ne
t
w
o
rking co
m
mands to work f
r
om a su
b
dir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C Hama
n
o
ls-tree
:
wor
k
from subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
hash-obj
e
ct:
work within sub
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C Ha
m
ano
c
h
eckout-inde
x
: work from subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
fsck-obj
e
cts: work fr
o
m subdi
r
ecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
p
e
ek-re
m
ote: hon
o
r prox
y
c
onfig even fr
o
m su
b
director
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C
H
a
man
o
git-apply: work from subdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
workin
g
from
subdirectory:
p
r
eparat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
ama
n
o
bisect:
quote pathnames for eval sa
f
ety
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
bisect: limit
the
s
ear
c
h
s
pac
e
by pa
t
h
specs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Ha
m
a
no
ls-tree: match the t
e
st to t
h
e 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 funny name quoting lost durin
g
rewrit
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
L
i
n
u
s T
o
rvalds
ls-tree: further tw
e
aks of the rewrite
commit
|
commitdiff
|
tree
2005-11-29
Linus Torval
d
s
ls-
t
r
e
e: fu
r
t
h
er
c
leanu
p
t
o
parallel ls-f
i
les
.
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
l
s
-tree: major rewrite
to do path
s
pec
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
wri
t
e
_
na
m
e_quoted(): m
a
ke
one of the path a co
u
nted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Haman
o
Documentation
:
Describe merge opera
t
ion a bit bette
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jan An
d
r
e
s
Fix
t
ypo in
ht
t
p-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
name-re
v
: fix parent cou
n
ti
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Haman
o
r
e
base:
o
ne safe
t
y net, one
b
u
gfix and one op
t
i
mization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Hamano
M
e
rge http
:
//www
.
kernel
.
or
g
/pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C Hamano
git-mv: qu
o
t
e
$src in regexp properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
config
.
c
:
const
n
ess tigh
t
ening to
a
void
c
om
p
ilat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo:
D
o not use -u=<encoding>; say --
e
ncoding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hama
n
o
mailinf
o
:
Use i18n
.
commitencoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
a
mano
ma
i
linfo:
a
llow -u
t
o fall back on latin1 to utf8 c
o
nversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Intro
d
uce i18n
.
commitenco
d
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Y
ann D
i
rson
F
ix gi
t
k thi
s
->selected diffs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C
H
amano
M
e
rge
h
ttp://ww
w
.
kernel
.
org/pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Josef Weid
e
ndorfer
git
-
mv: follow -k req
u
e
st ev
e
n on f
a
ili
n
g renames
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weide
n
do
r
fer
Small fixes in Documentat
i
on/git-mv
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
o
sef Weidendorfer
git-mv:
fu
l
ly de
t
ect 'direc
t
ory moved
i
n
to itself
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef
W
eidendorfer
git-mv: k
e
ep
gi
t
i
n
dex
c
on
s
istent
with file system
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef We
i
d
endorfer
git
-
mv: sh
r
i
n
k
usa
g
e
,
no u
s
age on error
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
i
o
C Hamano
set
u
p_gi
t
_dir
e
ct
o
ry():
chec
k
r
e
pository format v
e
rsio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C Ha
m
a
n
o
in
i
t-db: check tem
p
late and
reposi
t
ory format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C Hamano
C
h
eck
repository format
version in enter_repo()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Repo
s
itory f
o
rmat version check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
unio
C Ham
a
n
o
format-
p
at
c
h: output
filenam
e
reported to stdout
v
erbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
n
a
m
e
-re
v
: fi
x
off-by-
o
ne e
r
ror
i
n
--stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
A
l
e
x
ander Litvinov
git-mv i
s
no
t
a
b
le to handle big director
i
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
u
nio
C
H
a
mano
shell
.
c: complain
on insufficient argumen
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io C Hamano
g
i
t-sh-
s
etu
p
: move
t
he repo
s
ito
r
y
c
h
ec
k
to a
c
ore progr
a
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Hamano
setup
_
g
i
t_directory: make sure GIT_DIR
is a vali
d
reposito
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Hama
n
o
git-var: make it w
o
rk in subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
g
i
t-sh-setup:
die
i
f outsi
d
e
git rep
o
sitory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o
C
Hamano
parse-
r
e
mote and ls-remote clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C
H
amano
Prevent "git-commi
t
-a path1 path2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
config
.
c: avoid shadowing
global
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
YO
S
HIFUJI Hideaki
.
.
.
Fix a war
n
i
n
g ab
o
ut unus
e
d value
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next