repo.or.cz
/
git
/
jnareb-git.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
K
uivinen
git-mer
g
e:
E
x
it with code 2 if no strategy was able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No na
m
e
documenta
t
ion: git
-
tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
ama
n
o
d
ocumentation: gi
t
-bi
s
ect (help HTML break man)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
docum
e
ntation:
c
lari
f
y read-tree --
r
e
set
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ham
a
no
git-me
r
g
e
documentati
o
n: conflicting me
r
ge leaves h
i
g
h
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hama
n
o
merge-one-file: make sure we do not misme
r
ge symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C
Ha
m
ano
merge-one-file: make sure we crea
t
e the merg
e
d f
i
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio 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
J
unio
C
H
a
mano
me
r
ge-recursive: ad
j
u
st git
-
l
s
-tree use for the latest
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Al
e
x
R
ie
s
e
n
g
i
t wrap
p
er: more care
f
ul
argument stuffing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
gi
t
-merge-o
n
e-file:
d
o
not worry
a
b
o
ut 'rmdir -p' not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C Hama
n
o
ls
-
t
r
ee: -
-
name-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C Hamano
ls-tree:
resurrect '-d' to
m
ea
n
'show trees only'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
L
i
nus Torval
d
s
git-ls-tree: add "-t" opt
i
on to al
w
ays show the t
r
ee
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
u
n
i
o C Hamano
M
a
kefile: s
a
y the default targe
t
upfront
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
Documen
t
a
t
ion: descri
b
e '-f' o
p
tion to
g
it-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
T
i
m
o H
i
rvonen
Move couple of ifdefs after "includ
e
c
onfig
.
mk"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C
H
amano
Merge bran
c
h 'jc
/
subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Hamano
Merge br
a
nches
'
j
c/appl
y
', '
l
t/ls-tree
'
, 'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi Virtanen
Do not
a
ttempt to a
c
cess litera
l
dirn
a
me
"
GIT_OBJECT_D
I
RECTORY"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
T
u
torial: adjust merge example t
o
rec
u
rsive strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C
Hamano
me
r
g
e
-
recursive: match
t
he
unmer
g
ed index
e
ntry behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hama
n
o
diff-files
:
show di
f
fs with stage
0
and
u
nme
r
ge
d
s
t
ag
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linu
s
T
o
rvalds
merge-one-file:
l
eave u
n
me
r
g
ed index entries
u
pon autome
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
diff-f
i
les: -1/-2/-3 to diff against unm
e
rged
stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
git-diff: do
not turn off
-
p/-M
w
ith any diff options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
Merge h
t
tp:/
/
www
.
ker
n
el
.
org/pub/s
c
m
/
g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex Riesen
[PATCH] Add te
s
ts for g
i
t-
m
v in
s
u
bdirect
o
ri
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Johannes Sc
h
in
d
elin
[PATCH] Make
g
i
t
-
m
v work in subdirect
o
r
i
es, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o C Hamano
format
-
patch:
r
un diff
i
n C locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
ama
n
o
form
a
t-p
a
tch: do not a
b
u
s
e 3-dash
m
arker line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
f
ormat-pa
t
ch
:
r
emov
e
a
pplies
-
to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ap
p
lypatch: use "i
n
dex" lines not "appli
e
s-to
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
applymbox: typofix to enable -m
o
ption
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matthia
s
Urlichs
SVN imp
o
rt: Use
o
ne l
o
g
c
a
l
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
jdl@f
r
e
escale
.
com
Fix ty
p
o
s
and minor f
o
rm
a
t
issues
.
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
P
av
e
l Roskin
g
it-clone --shared
should im
p
ly --local
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
hash-object
.
c: t
y
pe-fix to squelch compiler warnings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
define
d
i
e()
f
or scripts
that use it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
verify-tag: make
it operable from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
t
a
g
: make
it
o
p
erable from a subdir
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
amano
lost-found
:
make it operab
l
e from a subdirec
t
o
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o C Hamano
branch: ma
k
e it op
e
rable fr
o
m a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
ls-re
m
ote: de
f
ine die() n
o
w we do
n
o
t use gi
t
-
s
h-setu
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ha
m
ano
count-o
b
jects: make
it
op
e
r
a
ble from a sub
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
Hamano
Mak
e
the
r
est o
f
comman
d
s work from a su
b
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io
C Haman
o
Ma
k
e net
w
orking commands to work 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
Haman
o
l
s-tree:
w
ork
f
rom subdire
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C
H
a
m
ano
hash-object
:
work within
s
ubdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
checkout-index: wo
r
k
f
rom subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
fsck-objects: wor
k
fro
m
s
u
bdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
peek-remote: honor proxy config eve
n
from subdi
r
ect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
g
i
t-
a
pply: wor
k
fr
o
m
s
u
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Ham
a
no
w
o
r
k
ing from
s
ubdirectory: preparat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
bisect: q
u
ote pathn
a
me
s
for
e
val safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
L
i
n
u
s Torv
a
lds
bisect: l
i
mit the searchspac
e
by pathspecs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
ls-tree:
m
atch t
h
e 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 Hamano
ls-tree: Resurrect funny name
quoting l
o
s
t during rew
r
it
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus
T
or
v
alds
ls-tree: further tweaks of the r
e
write
commit
|
commitdiff
|
tree
2005-11-29
Li
n
us Tor
v
alds
l
s-t
r
e
e: further cleanup
to
parall
e
l ls-file
s
.
commit
|
commitdiff
|
tree
2005-11-29
Li
n
us Torval
d
s
ls-
t
ree: major rewr
i
te to do
p
athspec
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
write_name_quote
d
(): m
a
ke on
e
of th
e
pa
t
h
a coun
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
Documentation: Desc
r
ibe merge operati
o
n a bit bette
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
an Andres
Fix typo in http-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
name-rev: fi
x
pare
n
t counting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C Hamano
rebase:
one safety net, one
bug
f
ix and
o
ne
o
ptimizat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Ha
m
a
no
Merge http
:
//w
w
w
.
kernel
.
org/pu
b
/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
git-
m
v:
q
uote $src in r
e
gexp properly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Hamano
con
f
ig
.
c:
c
onstness tightening
t
o
avoid compilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C H
a
mano
maili
n
fo: D
o
no
t
use -
u
=<encoding>; say --encoding
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hama
n
o
mailinf
o
: Use i18n
.
c
ommitencoding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C H
a
mano
mailinfo:
a
l
low
-u
t
o
fall
b
ack
on latin1 to ut
f
8 conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
i
o C Ham
a
n
o
Introduce i18n
.
commitencoding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Yann Dirs
o
n
Fix gitk this-
>
s
e
lected diffs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
u
n
i
o C Hamano
Merg
e
h
t
t
p
:
/
/www
.
kernel
.
org/pub/scm/gi
t
k
/
g
itk
commit
|
commitdiff
|
tree
2005-11-27
Jo
s
ef Wei
d
endorfer
git-mv: f
o
llow -k request eve
n
o
n
fa
i
ling
r
enames
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jo
s
ef
We
i
dendo
r
fer
S
m
al
l
f
i
xes in Docu
m
e
n
tati
o
n/git-mv
.
t
x
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weiden
d
orfer
git-
m
v:
fully de
t
e
c
t 'di
r
ec
t
ory m
o
ved into itself'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weide
n
dorfe
r
git-mv:
ke
e
p git index consis
t
e
n
t with file system
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
g
it-mv: shri
n
k
usa
g
e,
no usage o
n
error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
Hamano
s
e
tup_git_directory()
:
check repo
s
itory format vers
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
in
i
t
-db: c
h
eck te
m
p
l
ate an
d
repository format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C Hamano
C
h
e
c
k
repositor
y
f
o
r
mat version in enter_repo(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Reposito
r
y format version che
c
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C H
a
ma
n
o
f
ormat-p
a
tch: ou
t
put filenam
e
r
e
ported to
s
tdo
u
t ver
b
atim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Juni
o
C Ha
m
ano
name
-
rev: fix off-by-one
e
rror in
--stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
A
lexa
n
der Li
t
vinov
git-mv is not able to ha
n
dle big
d
irectories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Ju
n
i
o C Hama
n
o
shel
l
.
c: co
m
plai
n
on
insufficient argu
m
ents
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Hamano
git-s
h
-set
u
p
:
m
ove
th
e
rep
o
sitory che
c
k to a co
r
e
prog
r
a
m
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
setup_git_
d
ire
c
t
o
ry: make sur
e
GI
T
_DIR is a valid repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hama
n
o
git-var: mak
e
it work in
subd
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
i
o C Ha
m
ano
gi
t
-s
h
-setup: die
if outside git r
e
po
s
itory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
parse-rem
o
t
e and ls-remote clean-
u
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
a
m
a
n
o
Prevent
"git-commi
t
-a
p
ath
1
p
a
th2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
unio C Hama
n
o
con
f
ig
.
c
: avoi
d
shadowing
globa
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
YOSH
I
FUJI Hideaki
.
.
.
Fix a
warning about u
n
used value
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Andre
a
s Eri
c
sson
cvsimport:
Do
n
'
t let
l
ocal settings hind
e
r cvs user
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Joh
a
nnes Schinde
l
in
R
ename git-config-set to git-re
p
o-
c
onfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
unio C Hamano
d
i
f
f
-tree: teach single-commit d
i
f
f
-
t
ree to
honour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next