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 Kuiv
i
nen
git-merge:
E
xit with code 2 i
f
no strate
g
y
was
a
b
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No name
docu
m
entation:
g
it-tag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C Hamano
documentatio
n
: git-bisect (help
H
TML b
r
ea
k
man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No nam
e
documentation: c
l
ar
i
fy rea
d
-tree
--rese
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
n
i
o
C
Hamano
git-merg
e
documentation: c
o
nflicting mer
g
e
l
eaves higher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o C Ham
a
no
merge-one-file: make sure
we
d
o not mis
m
e
r
ge symboli
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o C Ha
m
ano
merge-one-file: make sure we c
r
eate the
merge
d
file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ham
a
no
t3100: add ls-tree -t a
n
d
-
d test
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Hamano
mer
g
e-recu
r
siv
e
:
a
djust git-ls-tree use for the l
a
test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
A
l
ex
R
iesen
git wrapper: more caref
u
l ar
g
ument stuffing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C Hamano
git-
m
e
rg
e
-on
e
-f
i
le:
do
n
ot worry a
b
out '
r
md
i
r -p' not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C H
a
mano
ls-tree: --name-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Haman
o
ls-tree: resur
r
ect '-d
'
to mean 'show t
r
e
es only'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Linus
T
orvalds
git-l
s
-tree:
a
dd
"-
t
"
option to alwa
y
s sh
o
w the tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Ha
m
ano
Makefile
:
say the
d
efault target u
p
f
r
o
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C
H
a
mano
Docu
m
entation:
describe '-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 ifd
e
f
s
after "inclu
d
e con
f
ig
.
mk"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hama
n
o
Merg
e
branch
'jc/sub
d
ir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ham
a
no
Merge branches
'
j
c
/appl
y
'
,
'l
t
/ls-tree',
'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi Vir
t
a
nen
Do not at
t
empt to
access l
i
teral
d
irna
m
e "GIT_OBJECT_D
I
R
ECTORY
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
u
n
i
o C H
a
man
o
Tutorial: ad
j
ust merg
e
example to recu
r
sive stra
t
e
gy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
Hamano
m
e
rg
e
-recursi
v
e: match the unmerged index entr
y
b
e
h
aviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
amano
d
i
ff-files: show diffs wi
t
h stage0 and
unm
e
rged stag
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
mer
g
e-one-file: le
a
ve u
n
merge
d
i
n
d
ex entries u
p
o
n
a
u
tomerg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linu
s
Torv
a
lds
dif
f
-
files:
-1/-2/-
3
to diff against unmerged stage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
unio C Ha
m
a
no
git-d
i
ff: 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
Junio C Hamano
Merge htt
p
://
w
ww
.
kernel
.
org/pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex Ri
e
sen
[PATCH]
A
dd t
e
sts for g
i
t-mv in subdirectori
e
s
Junio C Hamano
, Sat, Nov 26, 2005 03:45:52 +0100:
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Johannes Schind
e
lin
[PATC
H
] Make git-mv w
o
rk in subdirector
i
es,
too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Haman
o
fo
r
m
a
t-pat
c
h:
r
u
n di
f
f in
C
locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
f
o
r
mat-p
a
tch: do not
abuse
3-d
a
s
h marke
r
line
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
f
o
rmat-
p
atc
h
:
r
emove
applies
-
to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Ham
a
no
applypatch:
u
se "index
"
lines
n
ot "applies-to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
applymbo
x
: typofix to enable -m option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
M
atthia
s
Ur
l
ichs
SVN impor
t
:
Use on
e
log call
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jdl@frees
c
ale
.
com
Fix
t
ypos and
mino
r
format iss
u
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
N
ick H
e
ngeveld
htt
p
-pus
h
cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Roskin
git-clon
e
--
s
hared
s
hould i
m
ply --loca
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
h
ash-object
.
c: type-fix
t
o squelch co
m
pil
e
r w
a
rnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
define
die()
f
or scripts that u
s
e it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
verify-tag: ma
k
e it
o
perable f
r
om a
subdi
r
e
c
t
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Ha
m
ano
tag: make it operable fr
o
m a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
H
a
mano
lost-
f
ound: make i
t
ope
r
a
b
le f
r
om a s
u
bdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
branch: make it ope
r
able from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Ha
m
ano
ls-remote: defi
n
e di
e
() now we do
n
ot use git-sh-
s
etup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
co
u
nt-objects:
m
ake
i
t
operable from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
m
ano
Make t
h
e
rest of
c
ommands work from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Make netwo
r
king commands to wo
r
k from
a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hama
n
o
ls-
t
ree: work
f
rom subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
hash-obje
c
t
: work
w
i
thin s
u
bdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
checko
u
t-index: wor
k
f
ro
m
subd
i
rec
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C
H
amano
fsck-objects: work from subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
Hamano
peek-remo
t
e: honor proxy confi
g
even
fro
m
subdi
r
e
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
git-apply
:
w
o
r
k fr
o
m
subdi
r
ector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Ha
m
ano
working from subdir
e
ctory:
p
reparati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
bisect: qu
o
te pathna
m
es for
eval safety
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus
Torvalds
bisect: lim
i
t the
s
earchspace by
p
aths
p
ecs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
man
o
ls-t
r
ee: match t
h
e test to the new semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C
Hamano
l
s
-tree: R
e
surre
c
t funn
y
name quoting
lost durin
g
r
ewrite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
L
inus Torvalds
ls-t
r
ee: fu
r
ther
tweaks of the
rewrit
e
commit
|
commitdiff
|
tree
2005-11-29
L
i
nus T
o
rvalds
l
s
-tree: fur
t
her
c
l
eanup to
p
ara
l
lel
ls-files
.
commit
|
commitdiff
|
tree
2005-11-29
L
inus Tor
v
alds
ls-
t
ree: m
a
jor rewrite to do pathspec
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
write
_
nam
e
_quoted(): make one of the path a counted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Documentation: Describe m
e
rge
ope
r
ation a b
i
t better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jan Andres
F
ix typo in http-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C Haman
o
name-rev
:
fix parent c
o
unting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
rebas
e
:
o
n
e safety ne
t
, o
n
e
bu
g
fix a
n
d on
e
opt
i
mi
z
ati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
a
m
a
n
o
Merg
e
htt
p
:
//ww
w
.
kernel
.
org/pub/scm
/
g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C Hamano
git-mv: qu
o
t
e $s
r
c
in
r
egexp properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
i
o
C Haman
o
config
.
c: co
n
stn
e
ss tightening to avoid compilation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo: Do not u
s
e -u=<encoding>; say --encoding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Hamano
m
a
ilinfo: Use i18n
.
commitencoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Hamano
mai
l
info: allow -u to fall
b
ack on
latin1 to utf8 con
v
ersion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C H
a
mano
I
n
t
r
oduce i18n
.
commitencoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Ya
n
n Dirso
n
Fix git
k
this-
>
s
e
lec
t
e
d diff
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Merg
e
http://www
.
kernel
.
org/pub/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2005-11-27
Josef
Weid
e
ndorf
e
r
g
i
t-mv: fol
l
ow -k request even on failing ren
a
mes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Jose
f
Weide
n
dorfe
r
Small
fix
e
s
in Do
c
ume
n
tati
o
n/git-mv
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Jo
s
ef Weidendorf
e
r
git-mv
:
f
ully detect
'director
y
mo
v
e
d
into
i
tself'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef W
e
ide
n
d
o
rfer
g
i
t
-mv:
k
eep
g
i
t index c
o
nsistent with file sys
t
em
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
git-mv: shrink usage, no
usage on er
r
or
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Juni
o
C
Ham
a
no
s
e
t
up_g
i
t_di
r
ect
o
ry():
c
hec
k
repo
s
itory format
v
e
r
sio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ha
m
a
n
o
init-db: check t
e
mplate and repo
s
i
tory format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
C
h
eck repository
forma
t
version in enter_re
p
o()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Juni
o
C H
a
mano
Repository f
o
r
mat version check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
format-patch:
o
utput filename reported to st
d
out
v
erbat
i
m
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
name-rev: fix
o
ff-by-one er
r
or i
n
--stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Alexander Litvinov
git-mv is not
a
ble to handle big directories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
unio
C
Hamano
shell
.
c: complain on insufficient arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Ha
m
an
o
git
-
sh-setup: move th
e
repository chec
k
t
o
a core program
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
unio C Haman
o
setup_git_di
r
ect
o
r
y: m
a
ke sure GIT_DI
R
is a va
l
i
d
repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io C Ha
m
ano
g
it-var: m
a
ke it work in subdi
r
ec
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
g
i
t
-sh-setup: die
if outside git r
e
pository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Ha
m
a
no
par
s
e-remote and ls-r
e
mote clean-
u
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Hama
n
o
Prevent "git-com
m
it -a pat
h
1 path2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Hamano
confi
g
.
c
: avoi
d
shadowin
g
global
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
YOSHI
F
UJI Hideaki
.
.
.
Fix
a warni
n
g
a
bout unused
v
alue
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
A
n
dreas
Ericsson
cvsimport
:
D
on't let loc
a
l
s
ett
i
ngs hind
e
r cvs user
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Johann
e
s Schindelin
Rename git-
c
o
n
f
i
g
-set
t
o g
i
t-r
e
po-config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C
H
amano
d
i
ff-tre
e
:
teach
s
ingle-commit d
i
ff-tre
e
to
h
onour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next