repo.or.cz
/
git
/
spearce.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
Fred
r
i
k
Kuivi
n
en
git-
m
erge: Ex
i
t
with code 2 if
no str
a
tegy was able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
N
o name
documentati
o
n: git-tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
H
am
a
no
do
c
umentation
:
g
it-bis
e
ct
(
he
l
p
HT
M
L break man)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
documenta
t
ion: clarify
read-
t
ree
-
-reset
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
g
i
t-merge documen
t
ation
:
confl
i
ctin
g
m
e
rge leaves
high
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-one-fil
e
: make sure we do
n
ot misme
r
ge
symboli
c
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ham
a
no
merge-one-file: mak
e
sure w
e
create th
e
merged file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Hamano
t3100
:
add ls-
t
r
ee
-
t and -d tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
unio
C Hamano
merge-recursive: adjust git-ls-tre
e
use for the
l
atest
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Alex
R
i
e
s
e
n
gi
t
wrap
p
er: more careful ar
g
ument s
t
uffing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
uni
o
C Hama
n
o
git-merge
-
o
n
e
-
f
i
le: do not worry
about 'rmdir
-
p' not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls
-
tree
:
--name-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 me
a
n 'show trees o
n
ly'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Linus T
o
r
v
alds
gi
t
-ls-t
r
e
e
:
add
"
-t" option to
a
lways show the tre
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio
C
H
amano
M
akefile: say th
e
defau
l
t targ
e
t upfront
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
C H
a
mano
Document
a
tion: describe '-f' o
p
tion to git-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Tim
o
Hi
r
vonen
Move couple
o
f
ifdefs af
t
er "i
n
clude c
o
nfig
.
m
k"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hama
n
o
Mer
g
e branch 'j
c
/
subdi
r
'
commit
|
commitdiff
|
tree
2005-11-30
Junio
C
H
a
m
a
no
Mer
g
e branches 'jc/apply', 'lt/
l
s
-
tree', '
l
t/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi V
i
rt
a
nen
Do not attempt t
o
a
ccess
l
ite
r
al d
i
rname
"
GI
T
_OBJECT_D
I
REC
T
ORY"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Hamano
T
utorial: adjust
merg
e
example to recursiv
e
strate
g
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C Ham
a
n
o
merge-re
c
ursive: matc
h
the
u
nmerged
index entry behav
i
our
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C Hamano
diff-files:
s
h
ow diffs with sta
g
e0 a
n
d unmerged stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
L
i
nus
Torva
l
ds
merge-
o
n
e
-f
i
l
e:
l
eave unmerged index entries up
o
n
auto
m
erge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Li
n
u
s Torvalds
di
f
f-files: -1/-2/-3 to diff ag
a
in
s
t unmerged stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
unio C Ha
m
ano
g
it-di
f
f: do not turn off -
p
/
-
M with any diff options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C Hamano
M
e
rge
http://www
.
kernel
.
org/pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex R
i
e
sen
[PATCH] Add tests
f
o
r
g
i
t-m
v
in subdir
e
c
t
o
ries
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jo
h
annes Sc
h
indelin
[PA
T
C
H] Make git-
m
v
work in s
u
bdirectorie
s
, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
format-patch: run di
f
f
i
n C locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
f
o
rmat-patch
:
d
o not abuse 3-dash marker
l
ine
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
ama
n
o
format-patch: remove appli
e
s
-to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Ha
m
ano
a
pplypatc
h
: use "inde
x
"
lines not
"
applies-to"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
a
p
plym
b
ox:
t
ypofix to enabl
e
-m
o
ption
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matthia
s
Urlich
s
SVN import: Use one log call
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
jdl@freescale
.
com
Fix typos an
d
minor
f
o
r
mat issues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Nick H
e
n
geveld
http
-
push
cleanup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
P
a
vel
Roskin
git-clone --shared should imply
--local
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
ni
o
C
Hamano
h
a
s
h
-obje
c
t
.
c:
t
y
p
e
-fix to squelch
c
o
mpiler warni
n
gs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
defin
e
die()
for scripts that use
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
verify-tag: make it operable fro
m
a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
tag:
make i
t
operable
f
r
o
m a
subdirec
t
o
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hama
n
o
l
o
st-f
o
und: m
a
k
e it ope
r
able
from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
bra
n
ch: make it operable from a subdire
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C
H
aman
o
ls-re
m
o
t
e
: define die()
no
w
we
do not use git-sh-s
e
tup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C
Haman
o
co
u
nt-o
b
jects:
ma
k
e it operable from a subdi
r
e
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
Make the rest
of comm
a
nds
w
or
k
f
r
om a subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
M
a
ke ne
t
working comm
a
nds
t
o work
f
rom
a
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
l
s-tree: work from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C
Hamano
hash-obje
c
t: wo
r
k within 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
che
c
kou
t
-index
:
work from su
b
direct
o
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
ni
o
C
Hamano
fsck-objects: work from sub
d
irector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
peek-remote: hono
r
prox
y
config even from s
u
bdi
r
ectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
g
it-apply: work from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C H
a
m
ano
w
o
r
king fr
o
m subdire
c
tory:
prep
a
ration
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
bise
c
t: quote pathnames
f
or eval safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torva
l
ds
b
i
s
ect: limit the
search
s
pace
b
y pat
h
specs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
ls-tree: match the t
e
st to the
ne
w
sema
n
tics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C Ham
a
no
ls-tree: Resurrect f
u
nny n
a
me q
u
o
t
ing l
o
st du
r
ing rewrite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
L
inus Torvalds
ls-tree: further tweaks
of the rewrite
commit
|
commitdiff
|
tree
2005-11-29
Linus
T
orva
l
ds
ls-tree:
further c
l
eanup to p
a
rallel ls-f
i
les
.
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
ls
-
tree:
m
ajor rewrite to do pat
h
sp
e
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
w
r
ite
_
n
ame_quoted(): 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
Hamano
Docu
m
entati
o
n
: Describe mer
g
e
operation a
b
i
t better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jan Andre
s
Fix
t
ypo
i
n
http-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Ha
m
ano
name-rev: fix parent counting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C Hamano
rebase: one
saf
e
ty net, one bugfix
and one op
t
i
m
i
zation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Me
r
g
e h
t
tp://www
.
ker
n
el
.
org/p
u
b/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
H
amano
git-mv:
q
uote
$
src in
r
egexp properly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C
Ha
m
ano
config
.
c: const
n
ess tighteni
n
g to
a
void compilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C Hamano
mail
i
n
f
o: D
o
not use
-u=<e
n
coding
>
; say
--encoding
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o
C
Hamano
mai
l
i
n
fo: Use
i18n
.
commite
n
coding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C
Hamano
maili
n
fo
:
a
l
low
-
u t
o
fa
l
l ba
c
k on latin1
t
o utf8 conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hama
n
o
Introduce i18n
.
commi
t
e
n
coding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Y
a
nn Dirso
n
Fix gitk this->sele
c
ted diffs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C H
a
man
o
Merge http://w
w
w
.
kernel
.
org/pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2005-11-27
Jos
e
f Weidendo
r
fer
git-mv: follow -k
r
equest even on failing renam
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef We
i
de
n
dorfer
S
m
all fixes in Documentati
o
n
/gi
t
-m
v
.
txt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
osef Weidendor
f
er
git-mv:
fully d
e
tect '
d
ire
c
tor
y
moved into itself'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jos
e
f Weidendorfer
git-
m
v
: keep
g
i
t
index cons
i
stent with
f
il
e
s
y
s
t
em
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef We
i
d
endorf
e
r
git-mv: shrink usage,
no usage on er
r
o
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ham
a
no
setu
p
_git_d
i
r
e
cto
r
y
():
c
heck reposito
r
y format ver
s
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ham
a
n
o
init-db: check templat
e
and rep
o
sitory format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C Hamano
C
h
e
ck repository for
m
at
v
ersion in enter_r
e
p
o()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
R
e
posi
t
ory forma
t
v
er
s
ion c
h
eck
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
fo
r
mat-patch: output filename reported to
stdout
v
erba
t
im
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
J
unio C Hamano
name-rev
:
fix
o
f
f-by-one
e
rror in --stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Alexander Litvin
o
v
git-mv is not able to hand
l
e big directories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
she
l
l
.
c: c
o
mplain on insuff
i
cient argument
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
amano
g
it-sh-setup: move
the repo
s
itory
c
heck t
o
a core
p
r
o
gram
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o
C
Hamano
setup_git_dir
e
ctory: mak
e
s
u
r
e G
I
T_DIR is
a
valid repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
am
a
no
git-var:
m
ake it work in subdir
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Hamano
git-
s
h-setup
:
die if
o
u
t
side git r
e
pository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Ham
a
no
pars
e
-remote and ls-remote
cl
e
a
n-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Hamano
Pr
e
v
e
nt "
g
it-commit -a
path1 path2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io C Ha
m
ano
config
.
c: avoid sh
a
do
w
ing global
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIFUJI Hideaki
.
.
.
F
i
x a
warning a
b
ou
t
unused value
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
An
d
reas Ericsson
cvsim
p
ort:
Don't l
e
t loca
l
s
ettings hinder cvs user
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Johannes
Schindelin
R
e
na
m
e
g
it-co
n
f
i
g-set to git-repo-c
o
nfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
unio C
H
ama
n
o
diff
-
tree:
teach single-c
o
m
mit diff-tree
t
o
h
onour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next