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
New test case: Criss-cross merge
2005-12-03
Fredrik Kuivinen
New tes
t
case: Criss-cr
o
ss
m
e
r
ge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik
Kuivine
n
New test
c
ase: merge with directory/
f
i
l
e co
n
flicts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
test-l
i
b
.
s
h
:
A
d
d
new f
u
n
ction
,
test_expect_code
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edr
i
k
Kuivinen
git-merge: Exit with code 2 if
n
o strate
g
y was able
.
.
.
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 Hamano
documentat
i
on: gi
t
-b
i
s
ect
(help HTML
break man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No na
m
e
d
ocumentation: clarify read-tree
--r
e
set
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C Hamano
g
i
t-merge docu
m
entation: c
o
nfli
c
t
i
ng m
e
rge leaves h
i
g
her
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
a
mano
merge-one-file: make sure we do not mismer
g
e symb
o
lic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge
-
on
e
-fi
l
e: mak
e
sure we create the
m
e
r
ged f
i
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io 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
merge-rec
u
r
s
ive:
adj
u
s
t git-
l
s-tree
use for the
l
atest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
A
l
ex Riesen
git wrapper: more c
a
reful argument stuffing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ham
a
no
git-merge-one-file: do not worry a
b
out
'rmdir -p
'
not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C
Hamano
ls-t
r
ee: --nam
e
-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls-tree
:
resurrec
t
'-d' to mean 'show trees
on
l
y'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Lin
u
s
T
o
rvald
s
git
-
ls-tree: add "-t" opti
o
n to always show
the tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o
C Hamano
Ma
k
efile: say the default target upfront
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o C Hamano
Documentation: describe
'
-
f' option to git-fetc
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
T
im
o
Hirvonen
Move couple
o
f if
d
ef
s
after "include co
n
fig
.
mk"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merg
e
br
a
nch 'jc
/
subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Me
r
ge branche
s
'jc/apply', 'lt/l
s
-tree', 'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi Virtanen
Do no
t
a
ttempt
to access litera
l
dirn
a
me "
G
IT_OBJECT_DIRECTORY"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io
C Hamano
Tutorial: adjust merge example to recursive strate
g
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
merge-
r
ecursive: match the un
m
erge
d
index entry beh
a
viour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio
C Hamano
diff-files: sho
w
di
f
fs with stage0 and unmerged stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
merge-one-file: leave unmerged index entries upon au
t
o
m
erge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
L
i
nus Torvalds
diff-
f
iles: -1/-2/-3 to diff against unmerg
e
d stage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C Hamano
git-diff: do not
t
u
rn off -p/
-
M
w
ith
a
ny d
i
ff opt
i
ons
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
Merge http://www
.
kerne
l
.
org/pub/scm/g
i
tk/
g
i
t
k
commit
|
commitdiff
|
tree
2005-11-29
Alex R
i
esen
[PATCH] Add
t
est
s
fo
r
git-mv in subdirectories
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 S
c
hind
e
lin
[PATCH] Ma
k
e git
-
mv work
in
subdire
c
tories,
t
oo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
format-patch: r
u
n diff in C locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Ham
a
no
format-patch
:
do not abuse 3-d
a
sh ma
r
ker line
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
format-
p
atch: remove applies-
t
o
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
applypatch: use
"
i
ndex" lines not "applies-to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
uni
o
C Hamano
appl
y
mbox
:
ty
p
ofix
to enable -
m
option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
M
a
tthia
s
Urlic
h
s
SVN
i
mport: U
s
e one log call
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jdl@frees
c
al
e
.
co
m
Fix ty
p
os and mino
r
f
o
rmat
issues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Nick Hengeveld
h
t
tp-push cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pav
e
l Roskin
git-cl
o
ne --shar
e
d sh
o
u
l
d
imply --local
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
h
ash-object
.
c: type-fix to s
q
uelch compiler war
n
ings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o
C Haman
o
d
e
fine die() for scripts that
use it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
ve
r
ify-ta
g
: make
i
t
ope
r
able from
a sub
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
tag: make i
t
operable from a subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
Hamano
los
t
-found: make
it
o
perabl
e
from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
branch: mak
e
it
o
perable from a subdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-remote: define die() now we do not u
s
e git-sh-
s
etup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
co
u
nt-ob
j
ects
:
make it operable from a subdir
e
c
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C H
a
mano
Make th
e
rest of commands
w
ork fr
o
m a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
ni
o
C
Hamano
M
ake net
w
or
k
ing commands to work from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C
Hamano
ls-tree: work from
subd
i
rector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C
H
ama
n
o
h
ash-objec
t
: work within subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
ama
n
o
che
c
ko
u
t-index: work
from subdi
r
ector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C H
a
mano
fsck-o
b
j
ects: w
o
rk from subdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
H
am
a
no
peek-rem
o
te: honor
p
roxy config e
v
en fro
m
s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hama
n
o
git-apply: work from subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
a
no
w
o
r
k
i
ng from subdirectory: p
r
eparati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
bisect
:
quote pa
t
hnames for eval safety
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torv
a
lds
bisec
t
: limit the searchspace by pathspecs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
ls
-
tree
:
mat
c
h the tes
t
to the new
semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Ha
m
ano
ls
-
tree: Re
s
urr
e
ct funny nam
e
qu
o
ting lost d
u
r
ing rewrite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus
Torvalds
ls-t
r
ee: fur
t
her tweaks of
t
h
e
rewrite
commit
|
commitdiff
|
tree
2005-11-29
L
i
n
u
s
Torvald
s
l
s
-tree: fu
r
t
her cleanup to parallel ls-files
.
commit
|
commitdiff
|
tree
2005-11-29
L
i
nus Torval
d
s
ls-tree
:
major rewrite to do pathspec
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
write
_
name
_
quoted(): make one o
f
t
he path a
c
o
unted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hama
n
o
Documentati
o
n: D
e
scribe mer
g
e ope
r
a
t
i
o
n a bit better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ja
n
Andres
Fi
x
typo in h
t
tp-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
J
uni
o
C Hamano
name-rev: f
i
x
parent c
o
u
nti
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C
Hamano
reb
a
se: one
safety net,
o
ne
bu
g
f
ix and one optimi
z
a
t
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
M
e
rge http://
w
ww
.
ke
r
n
el
.
o
rg/pub/sc
m
/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
amano
git-mv
:
q
u
o
te $src in regexp prope
r
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Hamano
c
onfig
.
c:
cons
t
ness tightening to avoi
d
compilation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C H
a
mano
mai
l
info:
Do
not use -u=<encoding>; say --encodi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hama
n
o
m
a
ilinfo: Use
i18n
.
commite
n
c
o
d
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C Hamano
m
a
ilinfo: allow -u t
o
fall back on latin1 to
u
t
f8 c
o
nversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
ano
I
n
t
roduce i18n
.
c
o
mmitencoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Yann Dir
s
on
F
ix gitk this-
>
selected diff
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Merge http:
/
/ww
w
.
kernel
.
org
/
pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendo
r
fer
git
-
mv: foll
o
w -k request even on fai
l
ing renames
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weid
e
ndorfer
Sm
a
l
l fixes in Docum
e
n
tation/git-mv
.
t
x
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Jos
e
f
W
e
idendorfer
git-mv: fully det
e
c
t 'directory moved into itself'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
o
sef
W
eidendorfe
r
git-mv: keep
git index
c
on
s
istent wit
h
fil
e
sys
t
e
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
osef Wei
d
endor
f
er
gi
t
-mv: shr
i
nk usa
g
e
, no
u
s
ag
e
o
n
err
o
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ham
a
no
setup_git_direc
t
ory(): check
r
epo
s
i
to
r
y
f
ormat version
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
in
i
t-db
:
check template a
n
d
repository format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C
Haman
o
C
h
eck repository forma
t
version
i
n
enter_
r
e
po
(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Repository fo
r
mat v
e
rsio
n
check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C
H
ama
n
o
format-patch: o
u
tput filename re
p
orted to stdout verba
t
im
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C Ha
m
ano
name-rev: fix of
f
-by-
o
ne error in
--st
d
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
A
l
exa
n
der Litvinov
git-mv is not
a
b
l
e
to handle big directories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Haman
o
shell
.
c: co
m
plai
n
on i
n
suff
i
cient
arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Ha
m
ano
git-sh-
s
etup:
m
ove th
e
repo
s
itor
y
check to
a
c
o
re progr
a
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o C Hama
n
o
setup_git_directo
r
y:
make sure GIT_D
I
R is a
valid repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Ham
a
no
git-var:
ma
k
e it work in
s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
unio C Ham
a
no
git-sh-setu
p
:
die if outside git repos
i
t
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
io C Hamano
parse-remote
an
d
ls-
r
e
m
ot
e
c
l
ean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
Prevent "g
i
t-commit -a path
1
p
ath2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C H
a
mano
config
.
c: avoid s
h
adowin
g
global
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIFU
J
I Hi
d
eaki
.
.
.
Fix
a
w
a
r
ning about unused value
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next