repo.or.cz
/
git
/
repo.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 Kuivinen
git-merge:
Exit
wit
h
code 2 i
f
no strategy
w
as able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No
nam
e
documentation: git-
t
ag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C H
a
man
o
d
o
c
umentation: g
i
t
-bise
c
t (h
e
lp HTM
L
b
reak man)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No n
a
me
do
c
umentatio
n
: cla
r
ify re
a
d-tree --rese
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Haman
o
git-m
e
rge
documentation: c
o
nflicting merge leaves hi
g
her
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
ama
n
o
merg
e
-
o
ne-fil
e
: make s
u
re we
d
o n
o
t mismerge symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Ha
m
ano
merge-one-file: make sure we cre
a
te the
merged f
i
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
am
a
no
t3100: add
ls
-
tre
e
-t and -d tes
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C H
a
m
a
no
merg
e
-rec
u
rsive: adjust git
-
ls-tree
use for the la
t
est
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Ale
x
Rie
s
en
git wrapper: m
o
re carefu
l
argumen
t
stuffing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
git-merg
e
-
o
ne-file:
d
o not worry about
'rmdi
r
-p' not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
u
n
io C Hamano
l
s
-
t
r
ee: --name-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
H
amano
ls-tree: res
u
rrect
'-d' to mean 'show trees only'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Lin
u
s T
o
rv
a
lds
g
i
t-ls-t
r
ee: add
"
-t" option to always show
t
he t
r
ee
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio
C Hamano
Makefile: say the
default t
a
rget upfront
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C
Ham
a
no
Documentation: d
e
sc
r
ibe '-f' option to git-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Timo Hirvonen
Move couple of
i
f
d
efs after "include config
.
m
k
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
M
erge branch 'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C Hamano
Merge
branches 'jc
/
apply',
'
lt/ls-
t
ree', 'lt/bi
s
ect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi V
i
r
ta
n
en
Do not attem
p
t to access
l
ite
r
al d
i
rname "GI
T
_OBJEC
T
_D
I
RECTORY"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ham
a
no
Tu
t
or
i
al: adjust merg
e
example to recursive strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C Hamano
merge-recursive:
match the
unmerg
e
d
i
ndex e
n
try b
e
haviou
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Hamano
diff-files:
s
how diffs with
s
t
age
0
and unme
r
ged
stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Li
n
us Torval
d
s
merge-one-file
:
leave unm
e
rged index entries upon aut
o
me
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linu
s
Torvalds
diff-files: -1
/
-2/-3 to
d
i
f
f
against
u
nmerged stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
git-dif
f
: do not turn o
f
f
-
p
/-M wi
t
h
any
d
iff op
t
io
n
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
M
erge http://www
.
kernel
.
org/pub
/
scm/
g
it
k
/
git
k
commit
|
commitdiff
|
tree
2005-11-29
Alex Riesen
[
P
ATCH] Add tests
f
or gi
t
-mv in
subdirectories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Joha
n
nes Schi
n
de
l
in
[
P
ATCH] Make git-mv work
i
n subdirectories, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C
Haman
o
for
m
a
t-patch: run dif
f
in C l
o
c
a
le
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C H
a
man
o
forma
t
-patch: do not abus
e
3-dash
marker line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Haman
o
format-patch: remove app
l
i
es-to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Ham
a
no
a
p
plypat
c
h: use "index" lines not "ap
p
lie
s
-t
o
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
n
o
applymbox: typofix to
e
nable -m option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matthias
U
rli
c
hs
SVN im
p
or
t
: Use one log call
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
jdl@f
r
ees
c
ale
.
com
F
i
x
typ
o
s and minor format
issues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Nick Hengeveld
h
ttp
-
p
ush clea
n
u
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
P
a
vel Roskin
git-clone --s
h
ared should imply --local
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
hash-
o
bject
.
c: type-fix to sq
u
elch com
p
iler
w
arnings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
Hama
n
o
d
e
fi
n
e 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
verify-ta
g
:
ma
k
e it oper
a
ble from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
tag: ma
k
e
i
t operable from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io
C Haman
o
lost-foun
d
: ma
k
e
i
t operable
f
r
o
m
a su
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
branc
h
: make it
o
perable fro
m
a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C
Hamano
l
s-remot
e
:
def
i
ne die() now we do not use gi
t
-sh-setup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
c
o
unt-obj
e
c
ts: ma
k
e
i
t op
e
rable from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Make the rest of
c
ommands wo
r
k fr
o
m a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ha
m
ano
Make
networking com
m
an
d
s
t
o
w
o
rk f
r
om a
subdi
r
ectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Haman
o
ls-tre
e
:
w
ork from subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Haman
o
ha
s
h
-
o
bject: work within subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
checkout-
i
ndex: work fro
m
subdi
r
ec
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
fsc
k
-
o
b
jects
:
work from
s
ub
d
i
r
ect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Ha
m
ano
p
e
ek-remote: hono
r
prox
y
config even from
subdirec
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
git-apply: work
f
rom subdirector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
wor
k
ing from
s
u
b
directory: preparation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C
H
aman
o
b
isect: q
u
ote pathna
m
es for eval sa
f
ety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linu
s
Torvalds
bisect: l
i
mit the
searchspac
e
by pat
h
spec
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C Hamano
ls-tree: match t
h
e test
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-tr
e
e: Resurrect funny name
quoting
lo
s
t
duri
n
g
rew
r
ite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus
Tor
v
alds
ls-tree: f
u
rt
h
er tweaks of the rewrite
commit
|
commitdiff
|
tree
2005-11-29
Linus To
r
vald
s
ls-tree: further cle
a
n
up to parallel ls-files
.
commit
|
commitdiff
|
tree
2005-11-29
Linu
s
Torvalds
ls-tree:
m
ajor rewrite to do
pat
h
spec
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
wri
t
e_name_q
u
oted(): ma
k
e one of
t
he path a cou
n
ted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
Documentation
:
Describe merge opera
t
i
on
a
bit better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jan And
r
es
F
i
x
typo in http-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
nam
e
-rev
:
fix
p
aren
t
count
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io
C
Hama
n
o
rebas
e
:
one sa
f
ety
net, one bu
g
fix and one optimization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Merge
h
tt
p
://ww
w
.
k
ernel
.
org/pub/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
H
a
m
ano
git-mv: quote
$src
in regexp properly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
H
amano
config
.
c: constness ti
g
htening to avoid compilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C Hamano
m
ailinfo: Do not us
e
-u=<e
n
cod
i
ng>; 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
ailinfo:
Use
i18n
.
commitencoding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo:
a
ll
o
w -u to fall ba
c
k on latin1 to utf8
c
onv
e
rsion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Introdu
c
e i18n
.
co
m
mite
n
co
d
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Yann Dirson
Fix
g
i
t
k
thi
s
->selec
t
ed
d
iffs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Merge http://
w
ww
.
k
e
rnel
.
o
rg/pub
/
scm/gi
t
k/
g
itk
commit
|
commitdiff
|
tree
2005-11-27
Josef Weide
n
dorf
e
r
git-
m
v:
follow -k
r
e
q
uest
e
ven on failing renames
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weiden
d
orfer
Small fixes in Documen
t
a
t
ion/git-mv
.
txt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidend
o
rfer
git-mv: fully det
e
ct 'directory
m
o
v
ed into itself'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
o
sef Weiden
d
orfer
git-mv:
keep g
i
t index consist
e
nt
w
i
t
h file system
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef
W
eidendorfer
git-mv:
s
hrin
k
usage,
n
o usage on er
r
or
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
H
ama
n
o
setu
p
_git_dire
c
t
ory():
c
heck repository form
a
t
v
ers
i
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
in
i
t
-
db: check temp
l
a
te
and repository format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Check
r
epository fo
r
ma
t
versi
o
n in enter_repo()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
unio
C
H
amano
Repository f
o
r
m
at
v
e
r
sion ch
e
ck
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Jun
i
o C Haman
o
for
m
at-
p
atch:
output filename report
e
d
to stdout
v
erb
a
tim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C H
a
mano
name-rev:
f
i
x of
f
-by-on
e
error in --stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Alexande
r
Litvinov
git-mv is not able to handle big dir
e
ct
o
ries
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Ham
a
no
shel
l
.
c
:
com
p
la
i
n on insu
f
ficient arguments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
unio
C
H
amano
git-sh-setup:
move the repository check to a c
o
re program
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
amano
set
u
p_gi
t
_dir
e
ctor
y
: make sure
GIT_D
I
R
i
s a valid repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-
v
ar:
m
a
ke
it work in subd
i
rector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Ha
m
ano
git-sh-setu
p
: di
e
if outside git re
p
osit
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Haman
o
parse-re
m
ote a
n
d
ls-remote c
l
ean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
P
r
event "git-commit -a path1 pat
h
2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
config
.
c:
avoid shadowi
n
g
g
l
o
bal
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIFUJI Hidea
k
i
.
.
.
Fi
x
a
warni
n
g
about
unus
e
d va
l
ue
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
A
n
dreas Er
i
csson
cvsimpor
t
:
D
o
n'
t
let
local set
t
i
n
gs hinder cvs
user
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Johann
e
s
Schindelin
Rename git-con
f
ig-se
t
t
o g
i
t-repo-conf
i
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
unio
C
Ham
a
no
d
iff-tree
:
te
a
ch sing
l
e-commit diff
-
tree to honou
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next