repo.or.cz
/
alt-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
Fredri
k
Kui
v
inen
g
it-merge: Exit w
i
th code 2
if no
s
trategy was able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
documentation: gi
t
-
t
a
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
H
a
man
o
docume
n
tation: git-bisect (help HTML bre
a
k
man)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
d
ocume
n
tation: cla
r
ify read
-
tree --rese
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ham
a
no
git-merge documen
t
ati
o
n: conflicting me
r
ge leaves
h
igh
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
a
mano
merge
-
one-file:
m
ak
e
s
u
re we do not mismer
g
e symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
m
e
rge
-
one-file: make sure we crea
t
e the merg
e
d
f
ile
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C H
a
mano
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 Ham
a
no
merge-re
c
ur
s
ive: adjust git-ls-tree
u
s
e for
th
e
la
t
est
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Alex Riesen
g
it wrapper:
m
o
re carefu
l
argument stuffing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
n
io C
Haman
o
git-
m
erge
-
one-file:
d
o not worr
y
a
bo
u
t '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
Ju
n
io C
Hamano
ls-tree:
resurrect
'
-
d'
t
o m
e
an 'show tree
s
only'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Linus Torvalds
git-ls-tree: add "-t" option to always
s
h
ow
the
t
ree
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
H
amano
Makefi
l
e
:
sa
y
the defau
l
t targe
t
up
f
ron
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
H
a
m
a
no
Documentation: de
s
c
r
i
be '-f'
o
p
tion to git-fe
t
c
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
T
imo Hirvo
n
en
Move
c
ouple
o
f
ifdefs a
f
t
e
r "inc
l
ude c
o
nfig
.
mk"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
am
a
no
Merge b
r
anch 'jc/su
b
dir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Mer
g
e branches 'jc
/
apply'
,
'lt/ls-tree',
'lt/b
i
sect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi Virtanen
Do
n
ot attempt
to acces
s
lit
e
r
al dirname "GIT_OB
J
ECT_DIR
E
CTORY"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tutorial:
adjust merge ex
a
mple
to recursive strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
u
n
io C Hamano
merge-recursive:
m
atc
h
the unmerged
index entry behavio
u
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Hamano
diff-files: show
d
iffs
w
ith st
a
ge0 an
d
unm
e
rged
stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
merg
e
-
o
ne-file
:
le
a
ve unmerged in
d
ex
entri
e
s upon automerge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
L
i
n
u
s
Torvalds
dif
f
-files: -1/-2/-3 to dif
f
a
gainst
u
nme
r
ged stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C H
a
mano
g
it-diff: do
n
ot
t
urn off -p/
-
M
with any d
i
ff
o
ption
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
Merge h
t
tp://ww
w
.
kernel
.
o
r
g/pub/
s
cm/gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex
Riesen
[P
A
T
CH]
Add test
s
f
o
r
g
it-mv
i
n subdirect
o
r
i
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Johann
e
s Schi
n
del
i
n
[PATCH] Make git-mv wor
k
in subdirec
t
ories, to
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C H
a
mano
for
m
at-patch: run diff in
C
locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
form
a
t-patch: do
not ab
u
se
3-dash marker
line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C Hamano
format-patch: remove applies-to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
appl
y
p
atch: us
e
"index" lines not "applies-to"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hama
n
o
applymb
o
x: typo
f
ix to enable
-m option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Mat
t
hias
U
rlichs
SVN
i
mport: Use
o
n
e
log call
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
j
d
l@free
s
c
a
le
.
com
Fix typo
s
and mi
n
or
format is
s
ues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
N
i
ck Hengeveld
http-pus
h
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
Juni
o
C Hamano
h
ash-o
b
j
ect
.
c: type-f
i
x to sq
u
elch
c
omp
i
ler war
n
ings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hama
n
o
define die(
)
for scripts that use it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
veri
f
y-tag:
ma
k
e
it oper
a
ble from a
subdi
r
ecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
tag: make it op
e
rable from
a subdire
c
to
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
lost-found
:
m
ake it
o
p
erable from a
s
u
b
dir
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
branch: make it opera
b
le from a
s
u
b
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
ls-remote: defin
e
di
e
(
) now we
do not use git-sh-setup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
c
ount-objects: make it
operable f
r
om a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
Make
the re
s
t of com
m
ands work from a s
u
bdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
H
amano
Make
networ
k
ing command
s
t
o wor
k
from
a
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
ma
n
o
l
s-tr
e
e
:
work from s
u
bd
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
hash-ob
j
ec
t
: w
o
rk within su
b
d
i
r
e
cto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
c
heckout-
i
ndex: work from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
fsck-objec
t
s: wo
r
k from
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
p
eek-remote
:
h
onor proxy config
e
v
e
n from s
u
b
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
uni
o
C Hamano
git-apply: work from subdirector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
workin
g
f
r
om sub
d
irectory: preparati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Ham
a
no
bisect
:
quote pathnames for eval safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
L
i
n
us Torvalds
b
i
s
e
ct: limit the
searc
h
space by pathspecs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-tree:
mat
c
h the
test to the
new sema
n
tics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-tree
:
R
e
surrec
t
fun
n
y name quoting lost
d
uring rewrite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
L
inus Torvalds
ls-tree: furt
h
er tweak
s
of the
rewrite
commit
|
commitdiff
|
tree
2005-11-29
Linus
T
orvalds
ls-
t
r
e
e
: furth
e
r
c
l
e
anup to parallel ls-files
.
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
l
s-tree: major rewrite to do
pathspec
commit
|
commitdiff
|
tree
2005-11-29
J
un
i
o C Hamano
write_name_quoted(): make o
n
e
of the path a
c
o
unted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Docum
e
ntation: De
s
cribe
m
erge oper
a
tion
a
bit better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
a
n Andres
Fix typo in
h
ttp-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
name-rev: fix pa
r
ent counting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
re
b
ase: one saf
e
ty
n
et, one
bugf
i
x and
one optimiz
a
t
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
mano
M
e
rge
h
t
tp://www
.
kernel
.
org/pub
/
s
c
m
/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C H
a
m
a
no
git-mv: quote $src in rege
x
p
p
rop
e
rly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
config
.
c
:
con
s
tness ti
g
htening to av
o
id co
m
p
ilati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C Hamano
maili
n
fo:
D
o
n
ot use
-u=<encodi
n
g>; say
-
-encoding
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Ham
a
no
mailinfo: Use i18n
.
co
m
mitencoding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
m
ailinfo
:
a
llow -u to fall back on
l
a
t
i
n1 to
u
t
f
8
conve
r
s
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
i
o
C Hamano
I
ntroduce i18n
.
co
m
mitencoding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Y
a
nn Dirs
o
n
Fix gitk
this->sele
c
te
d
d
i
ff
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C Hamano
Mer
g
e h
t
tp://www
.
kernel
.
org/pu
b
/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-27
Jose
f
W
eidendorfer
git-mv: follow -k request
even on f
a
iling renames
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef W
e
id
e
ndorfer
Small f
i
xe
s
in Documentation/g
i
t-m
v
.
tx
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
o
sef
Weidendorf
e
r
git-mv: fully
detect 'directory m
o
v
ed into itself'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Wei
d
endorfe
r
git-mv: ke
e
p git index consis
t
ent with fi
l
e syste
m
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
git-mv: shrink
u
sage, no usage on error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C Hamano
setup_git_directory(): check
r
ep
o
si
t
ory
format
v
ers
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C
Hamano
i
nit-db:
c
h
e
ck
t
emp
l
at
e
and reposito
r
y format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Ch
e
c
k reposito
r
y format version in
ente
r
_
re
p
o()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Repository
f
orm
a
t
v
ersio
n
che
c
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Ha
m
ano
forma
t
-pat
c
h: output filename r
e
ported to stdout verbatim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Jun
i
o C Hamano
name-rev: f
i
x o
f
f-by-one err
o
r in
--st
d
i
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Alexander Litvinov
git-
m
v
is no
t
a
b
l
e to h
a
ndle big dir
e
c
t
or
i
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C H
a
man
o
shell
.
c: complain on insufficient arguments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C H
a
mano
git-sh-se
t
u
p
: move the repository check to a core program
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
setup_git_direct
o
ry: make s
u
re
G
I
T_DIR is
a
valid repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
unio C Hamano
git
-
var:
make it work in subdire
c
t
o
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
ni
o
C Hamano
git-s
h
-setup:
d
ie if outside g
i
t re
p
o
s
itor
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
pars
e
-remote and ls-remote c
l
ean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C H
a
m
a
no
Preve
n
t "git-
c
ommit -a
p
ath1
path2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
conf
i
g
.
c:
a
void
s
h
adowing g
l
obal
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIFUJ
I
Hideak
i
.
.
.
Fix
a warning ab
o
ut un
u
sed value
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
A
n
dreas
Er
i
csson
cvsimport: Don't let
local settings
hind
e
r cv
s
user
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Johannes Schindelin
R
e
name git-co
n
f
ig-set to
git-rep
o
-config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
u
nio C
H
aman
o
diff-tree:
t
each single-commit diff-tree to hono
u
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next