repo.or.cz
/
git
/
gitweb.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
Fredrik Ku
i
vinen
New test case: C
r
iss-c
r
o
s
s
m
e
r
ge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vin
e
n
Ne
w
test c
a
se: mer
g
e wi
t
h
d
irectory
/
fi
l
e con
f
licts
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivinen
test-lib
.
sh: Add new functi
o
n, te
s
t_
e
xpect_code
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik K
u
i
v
ine
n
g
it-merge: Exit wi
t
h co
d
e 2
if no str
a
tegy was able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No na
m
e
documentation: git-tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
docum
e
ntati
o
n: git-b
i
se
c
t
(help HTML break man)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No
name
d
o
cumenta
t
ion:
c
larify r
e
ad
-
tree --reset
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
git-merge documentation:
con
f
licting
merge leaves
hig
h
er
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C H
a
man
o
merge-one-file
:
make sure we do not mismerge symboli
c
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C
H
a
mano
merge-one-fi
l
e: ma
k
e su
r
e we creat
e
th
e
merged file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
n
io C Haman
o
t3100
:
ad
d
l
s
-t
r
e
e
-
t and
-d tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-recu
r
sive: adjust
g
it-
l
s-tree
use for th
e
latest
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Alex
Riesen
g
i
t
wrapper: more
careful argument stu
f
f
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o C Haman
o
git-me
r
g
e-one-fil
e
: do not worry about
'
r
md
i
r -p' not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io
C Hamano
ls-tr
e
e: --name-
o
n
l
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls-tree: resurrect '-d
'
to me
a
n 'show trees only'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Linus To
r
vald
s
g
i
t-ls-tree:
a
dd "
-
t
" option
t
o
always show the tre
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io C Hamano
Makefile
:
say the default ta
r
get upfront
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio C H
a
mano
D
o
cumentation: describe '-f' option to git-fe
t
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Timo Hirvonen
M
o
ve couple of ifd
e
fs aft
e
r
"
include c
o
nfig
.
mk"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
unio
C
H
a
mano
Merge
b
r
a
nch
'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merg
e
branches 'jc/a
p
ply',
'l
t
/ls-
t
ree', 'lt/bisec
t
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi Virtanen
Do n
o
t attempt to
a
ccess literal d
i
rname "GIT_OBJECT_DIRECTOR
Y
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C Hamano
Tutorial:
adjust merge example to
rec
u
rsive str
a
t
e
gy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C Hamano
me
r
ge-recursiv
e
:
m
atch the un
m
e
r
g
ed inde
x
entr
y
behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C Hama
n
o
diff-files: show diffs with stage0 and
u
nmerged stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
L
i
nus Torvalds
merge-one-file:
l
eave
u
n
merged index entries upon
auto
m
erge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torv
a
lds
diff-fi
l
e
s
:
-1/-
2
/-3 to
d
if
f
against unmerged stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
unio C Haman
o
git-
d
iff: do not turn off -
p
/-M
with
any d
i
ff op
t
ions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C
Hamano
Merge htt
p
://www
.
kern
e
l
.
org/pub/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-29
Ale
x
Rie
s
en
[PATCH]
Add tests fo
r
git-mv i
n
subdirectori
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Johannes Sc
h
indelin
[
PATCH]
M
a
ke gi
t
-mv work in subdire
c
tories, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C H
a
mano
format-patch:
r
u
n diff in
C locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
fo
r
mat-patc
h
:
do not
abus
e
3-dash marker
line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hama
n
o
forma
t
-
patch: rem
o
ve ap
p
lies-to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
applypa
t
ch: use "index"
lines
not "app
l
ies-
t
o"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
a
pplymbox: t
y
pofix to enab
l
e -m option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matthi
a
s
U
rlic
h
s
S
VN import
:
Use on
e
l
o
g
c
a
l
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
jdl@frees
c
ale
.
com
Fi
x
typos
a
nd minor fo
r
mat issues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Nick Heng
e
veld
http-push
c
le
a
nup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Roskin
git-clone --shared
s
hould imply --local
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
hash-object
.
c: type-fix to squelch comp
i
ler wa
r
nings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
def
i
ne die()
f
or s
c
ripts
t
hat
u
se
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ham
a
no
v
erify-t
a
g: make it oper
a
ble fr
o
m a
s
u
bdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C
Ha
m
ano
tag:
make it
operable from a subdirector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
mano
lost-found: make it operab
l
e from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
branc
h
: ma
k
e
i
t
operabl
e
from a sub
d
irec
t
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o C
Hamano
ls-re
m
ote: defi
n
e di
e
()
n
ow
w
e do no
t
use git-sh-
s
etup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
count
-
objects: make
it operable from a
s
ubdirect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
M
ake the rest o
f
commands work from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
Mak
e
networking commands to w
o
rk fro
m
a
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Ha
m
ano
ls-tree
:
work from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
hash-ob
j
ect:
w
ork
within sub
d
irect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
c
h
eckou
t
-index: work
from subdirec
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C Hamano
fsck-o
b
jects: work from
s
ubd
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
peek-r
e
m
ote: honor proxy
conf
i
g even
from subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
git-apply: work
f
rom s
u
bdirector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
working from
s
u
b
directory: preparat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Ha
m
ano
bisect: quote pathname
s
for ev
a
l safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
bis
e
ct: limit th
e
searchspace
by pathspec
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
un
i
o C Hamano
ls-tree: match the te
s
t to
the n
e
w semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-t
r
ee: Resurrect funny name
q
uot
i
ng lost durin
g
rewrite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus T
o
rval
d
s
ls-tree: further
twe
a
ks of the r
e
wr
i
te
commit
|
commitdiff
|
tree
2005-11-29
L
inu
s
T
o
rvalds
ls-tree: further
c
leanup to parallel ls-f
i
le
s
.
commit
|
commitdiff
|
tree
2005-11-29
Linus
T
orv
a
lds
ls-tree
:
m
ajor rewrite to do pathsp
e
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
write_name_q
u
oted()
:
make
one of the path a
c
ounted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
D
o
cume
n
tation:
Describe merge op
e
rat
i
o
n
a
bit
better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jan
A
ndres
Fix typo in htt
p
-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Ham
a
no
name-
r
ev: fix parent counting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C
Hamano
r
ebase: o
n
e safety
n
et, one bugfix and
one
optimization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
Merge
h
t
tp
:
//www
.
kernel
.
or
g
/pub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio
C Hamano
git-mv
:
quot
e
$src in r
e
gexp properl
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
ano
config
.
c: constness tight
e
ni
n
g t
o
avo
i
d compilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C Hama
n
o
mai
l
info: Do
n
o
t
u
se -u=<encoding>; say --en
c
oding
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C
H
amano
mailin
f
o
: Use i18n
.
commit
e
ncoding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
ano
ma
i
linf
o
: a
l
l
ow -u to fall
b
ac
k
on lati
n
1 to utf8 conversio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C Hamano
I
n
troduce i18n
.
commitencoding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Yann Dir
s
on
Fi
x
gitk this
-
>se
l
e
cted
diffs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jun
i
o C Hamano
M
e
rge http://www
.
kernel
.
org/p
u
b/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Josef
W
ei
d
e
n
dorfer
git-mv:
f
ollow -k
requ
e
st
even on failing renames
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weiden
d
o
r
fer
S
m
all
fixes in Documentation/git-mv
.
txt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jo
s
ef Wei
d
end
o
rfer
g
i
t-mv: fully
detect 'directory m
o
ved i
n
to itsel
f
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
o
sef Weidendorfer
g
i
t
-mv: keep git index consistent with file sys
t
em
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
o
s
ef
W
eid
e
ndor
f
e
r
git-mv: s
h
ri
n
k usage, no usage on error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ha
m
ano
setup_git_
d
i
r
e
ctor
y
(
)
: c
h
e
c
k
repositor
y
for
m
at version
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
io C Hamano
init-db:
ch
e
ck
t
emplate
a
n
d repositor
y
format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ha
m
ano
Ch
e
ck rep
o
s
i
tory format version in enter_repo()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Ju
n
io
C Hamano
Repository f
o
rma
t
version c
h
eck
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
for
m
at-p
a
t
c
h: ou
t
put filename r
e
ported to
st
d
o
u
t verbatim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
J
u
nio C Hamano
name-rev: fix of
f
-by-
o
ne
error in
-
-stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Alexander Litvi
n
ov
git-mv is not able to hand
l
e big
d
irector
i
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
shell
.
c: complain on insufficient arguments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
amano
git-sh-setup
:
move
the
r
epo
s
itory
check to a core progra
m
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
setu
p
_
git_director
y
:
m
ake su
r
e GIT_DIR is a
v
a
lid r
e
pository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git
-
var: m
a
ke it work in subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-
s
h
-
s
e
tup
:
die
i
f o
u
ts
i
de
g
it repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C H
a
m
a
no
pa
r
s
e-remote
and ls-remot
e
clean-
u
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
Prevent "g
i
t
-c
o
mmit -a
p
ath1 p
a
th
2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
H
amano
c
onfig
.
c:
avoid sh
a
dowing
g
lobal
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIFUJI Hideaki
.
.
.
F
ix a warn
i
ng abou
t
u
n
used v
a
lue
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next