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
git-merge: Exit with code 2 if no strategy was able to handle the merge.
2005-12-03
Fredrik Kuivi
n
en
git
-
merge: Exit with code 2
if
n
o
stra
t
e
gy was able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
N
o
name
do
c
umentation: git-tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C
Hamano
do
c
umentat
i
on: git
-
bisect (h
e
lp
H
TML break man)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
documentation: clarify read-tr
e
e --re
s
e
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C Haman
o
g
i
t-merge do
c
umentation: conflic
t
ing merge leave
s
h
igher
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
i
o C H
a
m
ano
merge-one-file
:
make sure
we
do not mismer
g
e symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C Hamano
merge-on
e
-file:
m
a
ke sur
e
we creat
e
the merge
d
file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ham
a
no
t3
1
0
0: add
l
s-
t
r
ee -t
a
nd -d tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
m
e
r
g
e-
r
ecursive: ad
j
ust git-ls-
t
ree use for
t
he lates
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Alex
Riesen
g
it w
r
apper: more c
a
reful argument stu
f
f
in
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
ni
o
C Hamano
git
-
merge-on
e
-
fi
l
e: do no
t
worr
y
about 'rmdir -
p
' not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o C
H
am
a
no
ls-tree:
-
-name-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls-tree: res
u
rre
c
t '-d'
t
o mean 'show tre
e
s
only'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Linu
s
Torvalds
git-ls-tree: add
"
-t
"
opti
o
n to
a
lways
show the tre
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
Make
f
ile:
s
ay the
d
efault target upfron
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Haman
o
Doc
u
mentation: describe '-f' option to git-f
e
tch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
T
i
mo Hirvonen
Mov
e
c
ouple of
i
fdef
s
afte
r
"incl
u
d
e config
.
mk"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C
H
amano
Merge branc
h
'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merge br
a
n
ches 'jc
/
ap
p
ly', 'lt/ls-tree', 'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
T
ommi Virta
n
en
Do
n
ot attempt to acc
e
s
s li
t
eral
d
i
rname
"
GIT_OBJECT_DI
R
ECTORY"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
amano
T
utori
a
l: adjust merge
e
x
a
mple to recursi
v
e
s
trateg
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C H
a
mano
mer
g
e-recursive
:
m
a
t
c
h the
un
m
erged index entry
b
e
h
avi
o
ur
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
d
iff-files: sho
w
diffs with stage0 and unmerged s
t
age
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
merge-one-file: leave un
m
erged index
e
n
t
ries
u
po
n
automerge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
diff-files
:
-1/-2/-3
to dif
f
again
s
t unme
r
ged
stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Hamano
git-diff: do not turn off -p/-M w
i
t
h any
diff options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C H
a
mano
Merge http://www
.
k
e
rnel
.
org/pub/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-29
Ale
x
Ri
e
sen
[
PATCH] Add tests fo
r
g
i
t-m
v
in subd
i
rectories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Johannes Schin
d
e
l
in
[
PATC
H
] Make git-mv
work
i
n
s
ubdir
e
cto
r
ies, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hama
n
o
format-patch: run diff in
C
locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
m
ano
fo
r
mat-
p
atc
h
: do
not
a
buse 3-da
s
h
m
ar
k
er
line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
format-patch: remove app
l
ies-to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
ama
n
o
app
l
ypatch: use "index" lines not "applies
-
to"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
app
l
ymbox: typofix to enable
-
m option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ma
t
t
hi
a
s Ur
l
ichs
SVN
i
m
por
t
:
Use one log call
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
jdl@freescale
.
com
Fix typos and
m
inor
f
o
rma
t
i
ssues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ni
c
k Hengeveld
http-
p
us
h
cleanup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Roskin
git-
c
lone --shared should
imply
--l
o
cal
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Haman
o
hash-object
.
c: t
y
pe-fix to
squelch c
o
mpiler w
a
r
nings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C
H
a
m
ano
d
e
fine
d
ie() for
s
c
r
ipts tha
t
use it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
v
e
rif
y
-tag: mak
e
it operabl
e
from
a subd
i
r
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
H
amano
t
a
g: make it o
p
erabl
e
from
a
subdi
r
ect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
mano
l
os
t
-f
o
und: m
a
k
e
it ope
r
able
f
rom a su
b
dire
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
b
ranc
h
:
m
ake it operable fro
m
a
subdirecto
r
y
.
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
n
o
t
us
e
git-sh-se
t
up
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
c
o
u
nt-o
b
jects:
m
a
k
e it
operable fro
m
a
s
u
bdir
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
Make
the
rest
of commands work f
r
o
m
a subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C
H
amano
Make net
w
ork
i
ng commands to work from a s
u
b
dir
e
c
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
ls-tre
e
: work
f
r
om subd
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Ham
a
no
hash
-
o
b
ject
:
work within
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
chec
k
out-index: work from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
Hama
n
o
fsck-objec
t
s: w
o
rk fro
m
subdirect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
m
a
no
peek-re
m
ote: honor proxy confi
g
e
v
en f
r
om subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C H
a
m
ano
git-ap
p
ly:
w
o
r
k
from
s
ubdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
wo
r
king from sub
d
irecto
r
y:
p
re
p
arat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
bisect: quote pathnames for eval safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus To
r
valds
bi
s
ect: limit
t
he search
s
pace by pathspecs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o
C Hamano
ls-tree:
m
atch t
h
e test
t
o
t
h
e new s
e
ma
n
tics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
ls-t
r
e
e:
R
esurrect f
u
nny name quoting lost dur
i
ng re
w
rit
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torval
d
s
ls
-
tree
:
furth
e
r tweaks of the rew
r
ite
commit
|
commitdiff
|
tree
2005-11-29
Linus T
o
rv
a
l
d
s
ls-tree: further cleanup to para
l
lel ls-fi
l
es
.
commit
|
commitdiff
|
tree
2005-11-29
L
inu
s
To
r
val
d
s
ls-tree:
major rewrite to do pa
t
hspec
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C
Haman
o
write_name_quoted(): make one of the path a c
o
unted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Ham
a
no
D
o
cum
e
ntat
i
o
n: Describe merge operation a bit b
e
tter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jan Andres
Fix t
y
po
i
n
h
ttp-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
name-rev: fix p
a
rent counting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Ham
a
no
reba
s
e: one s
a
fety net, one bugfi
x
and o
n
e opt
i
m
izati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Haman
o
Merge http://ww
w
.
kernel
.
org/pub/scm/gi
t
k
/gitk
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C Hamano
gi
t
-mv: quote $src
i
n reg
e
xp properl
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C
H
amano
c
onfig
.
c: constness
tightening t
o
avoid compilat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C
H
amano
mailinfo:
Do
not use -u=<encod
i
ng>; say --encod
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Hamano
mailinfo: Use i18n
.
commitencoding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Hamano
mailinfo: allow -u to fal
l
b
a
ck on la
t
in1 t
o
utf8 co
n
version
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Hamano
Introduce i18
n
.
comm
i
te
n
coding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Y
a
nn D
i
rson
Fi
x
g
i
t
k
this->selected di
f
fs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
Hamano
Merge
http://www
.
kernel
.
org/pub/scm/gitk
/
g
itk
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
git-mv:
f
ollow
-k requ
e
st even
o
n
fa
i
ling renames
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
Small fixe
s
in Doc
u
m
entat
i
on/git-mv
.
tx
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef
W
eidendorfe
r
git-m
v
: full
y
detec
t
'direc
t
ory
m
oved into itself
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jose
f
Weidendorfer
g
i
t-mv: ke
e
p git index
c
on
s
i
s
te
n
t with
f
ile system
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfe
r
git-
m
v: shrin
k
usage, no usage on erro
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
unio C
H
amano
s
etu
p
_g
i
t_director
y
(): che
c
k reposit
o
ry format ve
r
s
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
init-db:
c
heck template and repository
format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C
H
a
m
ano
C
h
eck
r
epository format version in enter_repo(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Juni
o
C Ham
a
no
Repository format versio
n
ch
e
ck
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
J
u
n
io C Ham
a
no
format-pa
t
ch:
output filena
m
e
reporte
d
to stdout
v
erbatim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Ham
a
no
nam
e
-rev: fix
off-by-o
n
e
e
rror in
--stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Alexande
r
Litvinov
git-m
v
i
s no
t
able t
o
h
a
n
dle
b
ig
d
i
rectories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
she
l
l
.
c: co
m
plain
o
n insufficient arg
u
me
n
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o C Haman
o
git-sh-setup: mov
e
the r
e
pository chec
k
to
a c
o
re prog
r
am
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hama
n
o
setup_gi
t
_directory: make sure GIT
_
DIR is a vali
d
repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Ha
m
a
n
o
git-var: make it wor
k
in subdirect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Ha
m
a
no
git-sh-
s
etup:
d
i
e i
f
outside gi
t
repo
s
itory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
pars
e
-remote
a
nd
l
s-rem
o
te
c
lea
n
-u
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o
C
Hama
n
o
Pre
v
ent "git-commit -a
p
ath
1
path
2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o C Hamano
conf
i
g
.
c: avoid s
h
adowing global
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Y
OSHIFUJI
H
ideaki
.
.
.
F
ix
a
w
arning
a
b
out unused val
u
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Andreas Ericsson
cvsimport: Don
'
t let local setti
n
g
s
hinder
c
v
s user
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Johann
e
s
Schindeli
n
Re
n
ame git
-
con
f
ig
-
set to
git-repo-co
n
fig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Juni
o
C Hamano
diff-tree: teach single-commit diff-tree to hono
u
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next