repo.or.cz
/
git
/
jrn.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-02
J
unio C
Hamano
docum
e
ntati
o
n
:
git
-
bisect (help HTML
break man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
amano
git
-
merge
doc
u
ment
a
tion: conflicting merge leaves higher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
ni
o
C Hamano
merge-one-
f
ile: mak
e
su
r
e we do
n
ot mis
m
er
g
e
s
ymbolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ham
a
no
merge-one-file: m
a
ke sure we create the merged fil
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
t3100: a
d
d ls-tree -t and
-
d t
e
sts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Hamano
merge-
r
ecursive: adjust git-
l
s-tree us
e
fo
r
the
late
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
amano
git-merge-one-file: do
n
ot worry about 'rmdir -p' not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
H
amano
ls-tree: --
n
a
m
e-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
H
amano
ls-tree:
re
s
urrect '-d'
t
o m
e
an
'show tr
e
es
o
n
ly
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
Makefile: say the default target upfront
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
C
H
a
mano
D
o
cum
e
ntation
:
d
escribe '-f' option to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C Ham
a
no
Merge bra
n
ch 'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merge
b
r
a
nche
s
'jc/apply', 'lt/ls-tree',
'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
T
utorial: adjust me
r
ge example
t
o r
e
cu
r
s
ive strat
e
gy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C
Hamano
me
r
g
e
-recursive: match th
e
unmer
g
ed ind
e
x en
t
r
y behav
i
our
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
d
i
ff-files: s
h
ow dif
f
s with stage0 and unme
r
ged
s
tage
.
.
.
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 with any diff
opt
i
ons
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C Hamano
Me
r
ge
h
t
tp://ww
w
.
kernel
.
or
g
/pu
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C H
a
mano
f
orma
t
-
p
atch
:
run
d
iff
i
n C
l
ocale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
m
an
o
fo
r
mat-patch: do
n
ot a
b
use 3-dash marker line
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
format-p
a
t
c
h
: re
m
ove ap
p
lies-to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o
C
Hamano
applyp
a
tch: use "i
n
dex" li
n
es not "a
p
plies-to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
applymbox: typof
i
x to enable -m option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C H
a
man
o
h
ash
-
obj
e
ct
.
c: ty
p
e-fix
t
o squ
e
l
ch
c
ompiler warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
define die() for
scripts
that use it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
v
e
rify-tag:
make it op
e
r
a
ble from
a
subdire
c
to
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
tag:
m
a
k
e it
o
perable from a su
b
direct
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
lost-fo
u
nd
:
mak
e
it
o
perable from a subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
b
r
anch:
make
it o
p
erable
f
rom a subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
ls-r
e
m
ote: defin
e
d
i
e() n
o
w
we
do
n
ot use git-sh-setup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
c
o
unt-objects: ma
k
e it
o
perable from
a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C
Hamano
Make t
h
e rest of commands work
f
rom
a su
b
direct
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Haman
o
Make
n
etwo
r
king comma
n
ds to
w
o
r
k from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Haman
o
ls-tr
e
e: work from s
u
b
dir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C
H
amano
hash-object: work
with
i
n subdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
checkout-
i
ndex: work from subd
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C
H
amano
f
s
c
k
-objects: work
f
rom subdi
r
ect
o
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C Hamano
peek-remot
e
: honor proxy c
o
n
f
ig even f
r
om subdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
ama
n
o
git-a
p
p
l
y
: work
f
r
o
m subd
i
r
e
c
t
o
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
wor
k
ing fro
m
s
u
bdirectory: prepa
r
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io
C
Hama
n
o
bisect
:
q
u
o
te
pathna
m
es
for e
v
al
s
afety
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
Hamano
ls-
t
ree: match the test to t
h
e n
e
w semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls
-
tree: Resurrect funny name
q
u
o
t
ing lost dur
i
ng rew
r
it
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
a
no
wri
t
e_
n
ame_
q
uoted(): make o
n
e
of t
h
e path a counted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
Do
c
um
e
nta
t
i
on: Describ
e
me
r
ge oper
a
tion a bit bette
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
name
-
rev: fix p
a
rent counting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
io
C Hamano
rebase
:
one safety ne
t
,
one bugfix and one
o
ptimi
z
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Hamano
Me
r
ge
h
t
t
p://www
.
k
e
r
n
el
.
o
r
g/pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
git-mv: quot
e
$src in
regexp properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
a
n
o
[PATC
H
]
gitk: Use
i
18
n
.
c
o
mmi
t
encod
i
ng c
o
nfiguration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
amano
config
.
c: constness tighteni
n
g to avoid
c
omp
i
lat
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
ano
mailinfo: Do not use -u=<enc
o
d
i
n
g
>; say
--encoding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Haman
o
mail
i
nfo: Use
i
18n
.
c
o
m
mi
t
e
n
c
oding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
mailin
f
o: allow
-u to fall back on latin1
to utf
8
conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
amano
Int
r
oduce i1
8
n
.
commi
t
encoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Merg
e
h
ttp://www
.
kernel
.
org/pub/scm
/
gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-27
Junio
C Ham
a
no
setup_g
i
t
_dir
e
ctory(): ch
e
ck reposi
t
ory
format version
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C Hamano
i
nit
-
db: ch
e
ck temp
l
ate and repository form
a
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Check
r
ep
o
si
t
ory forma
t
version in enter
_
re
p
o()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
R
epository form
a
t
v
er
s
i
o
n chec
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hama
n
o
format-patch: output filenam
e
report
e
d to st
d
o
ut verbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
u
nio
C Ham
a
no
name-rev: fix off
-
by-one
e
r
r
o
r
in
-
-stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
shell
.
c: complain on
i
nsuffi
c
ient argu
m
ents
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
unio C Ha
m
ano
git-sh-setu
p
: move the r
e
pos
i
tor
y
check to a core program
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
a
m
a
no
setup_git_
d
irect
o
ry: make sure GIT_
D
IR is
a
valid
r
ep
o
s
i
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-v
a
r:
m
ake it work in su
b
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
gi
t
-sh-setup:
die if out
s
ide git repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio
C
Hamano
p
a
rse-remote and ls-
r
emote clean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Hamano
Preven
t
"
g
i
t
-commit
-a path1 p
a
th2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o C Ha
m
a
no
config
.
c:
avoid sh
a
dowing global
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C H
a
mano
di
f
f-tree:
teach
s
ingle-co
m
mit
d
iff-tree t
o
h
o
n
o
ur
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
Teach u
p
date-
i
ndex to
r
ead fro
m
ls-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
git-revert: make
-
-
edit default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
git-merge: make recur
s
i
v
e the default strategy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
J
unio C Hama
n
o
pack
-
r
e
dunda
n
t: type c
l
eanups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
J
u
nio C
Hama
n
o
Merge http://www
.
kernel
.
org/pub/scm
/
g
itk/gitk
commit
|
commitdiff
|
tree
2005-11-22
Jun
i
o
C Hamano
git-var: constness
a
nd globalness cleanup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
J
u
n
i
o
C Hamano
M
o
ve diff
.
r
enamelimit
out
o
f d
e
f
a
u
lt conf
i
g
u
ratio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Ju
n
io C Hamano
git-p
r
o
xy updat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
d
aemon
:
furthe
r
t
w
e
a
ks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hama
n
o
tutorial
:
setting
u
p a
t
r
e
e
for
s
ubsy
s
tem maintainers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C
H
amano
ren
a
me detectio
n
with -
M
100 me
a
n
s
"e
x
act
r
en
a
mes only"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C H
a
mano
format
-
pa
t
ch: f
i
x t
w
o-a
r
gu
m
en
t
special
cas
e
,
and make
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Hamano
Fix hook
s
/up
d
at
e
template
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Make
sure he
a
ds
/
foo and tags
/
foo
d
o
not confuse things
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C Hamano
Fix
"
do
n
ot DWIM" p
a
tch to enter_re
p
o"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hama
n
o
Merge http://www
.
kerne
l
.
org/pub
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-20
Junio
C
Hamano
merge-on
e
-
file: use rmdir -p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Documentati
o
n: add
h
oo
k
s/u
p
date exam
p
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Jun
i
o C
Ha
m
ano
Do not DWI
M
in userpa
t
h library under strict m
o
de
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
J
u
nio C Ha
m
ano
h
t
tp
.
c: reor
d
er t
o
avo
i
d
c
o
mpilation fail
u
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
mer
g
e-recursive
:
:re
m
oveFile
:
remove empty direct
o
ries
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Ju
n
io C Hamano
me
r
ge-on
e
-fil
e
:
r
emove
empty
directori
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Juni
o
C Ha
m
a
n
o
Doc
u
m
e
ntation: rebase-fro
m
-internal
m
i
n
or updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C H
a
man
o
git
-
r
epac
k
: do not
d
o complex redundancy check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
git-co
u
nt-objects:
d
c r
e
plac
e
ment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
readrefs: grab all refs with o
n
e call to
l
s
-remote
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C
H
amano
Merge http://
w
w
w
.
kernel
.
org/p
u
b/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-18
J
unio C
Hamano
Merge b
r
anches 'jc
/
branch'
a
nd 'jc/rebase'
commit
|
commitdiff
|
tree
2005-11-18
Jun
i
o C Ha
m
a
n
o
Rewri
t
e rebase to use
git-format-
p
atch pi
p
ed to git
-
am
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next