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
Documentation: topic branches
2005-12-03
Fred
r
ik
K
u
i
vinen
New
test case: merge wit
h
directory/fi
l
e conflict
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
n
en
test-lib
.
sh
:
Add new function, test_expect_code
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-merge: Exit
w
ith code 2 if
no strategy was able
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No
n
ame
documentation: git-
t
ag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hama
n
o
documentation
:
git-bisect
(
help
H
TM
L
break man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No na
m
e
documentation:
cla
r
ify read-tree --reset
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C Hamano
git
-
merge d
o
c
u
men
t
a
t
ion: conf
l
icting merg
e
leaves higher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
m
e
r
ge-o
n
e-fi
l
e: make sure we do not mismer
g
e
symb
o
lic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hama
n
o
m
e
rge-
o
ne-file: make
s
ur
e
we cre
a
t
e
t
he me
r
ged file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
t
3
100:
a
d
d ls
-
tree
-
t and -d tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
Hamano
m
erge-recursive: a
d
just git-ls-tree use fo
r
the latest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Al
e
x Ries
e
n
git wra
p
pe
r
: more ca
r
eful arg
u
me
n
t st
u
ffing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o C Hamano
git-merge
-
one-file: d
o
not worry about 'rmdir -p' no
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
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:
r
e
s
u
rrect '-d' to m
e
an 'show trees only'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
L
i
nus Torvalds
git-ls-tree:
add "-t" optio
n
to always show the tr
e
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
M
akefile: say the default
t
a
r
get up
f
ront
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio C Hamano
Documentat
i
on: describe
'-f' o
p
ti
o
n to git
-
fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Timo
H
irvonen
Mov
e
co
u
ple of i
f
def
s
af
t
e
r
"i
n
c
lude config
.
m
k"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C Ha
m
ano
Merge branc
h
'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C
Hamano
Merge branches 'jc/
a
pply', '
l
t
/ls-tree',
'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
T
o
m
m
i
Vir
t
ane
n
D
o n
o
t at
t
empt to
a
ccess liter
a
l dirname
"
GIT_
O
BJECT_DIRECTORY"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
unio C Hamano
T
u
torial: ad
j
u
st merg
e
example to recursive str
a
tegy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
merge-recursiv
e
: match the
u
n
merged index entry behav
i
o
u
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
Hamano
diff-files
:
show dif
f
s with stage0 and unmer
g
ed stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus
Torv
a
lds
mer
g
e-one-fi
l
e: leave unmerged index entri
e
s upon au
t
omerge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus
T
o
r
v
a
l
d
s
diff-files: -
1
/-2/-3 to diff
ag
a
inst u
n
mer
g
ed st
a
ge
.
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 an
y
d
iff options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
M
e
rge
http://www
.
kernel
.
o
r
g
/
pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex
R
iesen
[
P
ATCH] Add tests f
o
r
git-mv in subdi
r
ectori
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
J
o
hannes Schindelin
[PATCH] Make git-mv
w
ork i
n
su
b
directories, to
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format-patc
h
:
run diff in C local
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
Hamano
format-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
for
m
a
t-patch: remove
a
p
plies-to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
a
mano
applypatch: use "index" lines not "a
p
plies-to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
a
pplymb
o
x: typofi
x
to enable -m option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
M
atth
i
as Urlichs
SVN imp
o
rt: Use one log call
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jdl@
f
ree
s
cale
.
com
Fix typos and minor
format
i
ssues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ni
c
k
Heng
e
ve
l
d
http-push cle
a
nup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Roskin
git
-
c
l
one --shared shou
l
d
i
mp
l
y --l
o
cal
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
hash
-
obj
e
c
t
.
c: typ
e
-fi
x
to sq
u
elch compiler warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
define die
(
) f
o
r script
s
tha
t
use it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
ni
o
C Ham
a
n
o
verify-tag: make it o
p
erable from a subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hama
n
o
tag:
m
ake i
t
operabl
e
f
r
om a
s
ub
d
ir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C H
a
man
o
lo
s
t-fou
n
d: make it operable from a s
u
bdire
c
t
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
un
i
o C Ha
m
an
o
bra
n
ch: make
it
operable fro
m
a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Ha
m
ano
ls-remote: define die() no
w
we
d
o not us
e
git-sh
-
s
e
t
up
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
c
o
unt-o
b
jects: make it operable
f
rom a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
Make t
h
e rest
o
f
commands work fro
m
a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
Make networking commands to work from
a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
ls-
t
r
e
e: work
fr
o
m s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C H
a
man
o
hash-object: work within subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
c
heckout-
i
ndex: work from
s
ubd
i
rector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
fs
c
k-ob
j
ects:
w
ork from subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Haman
o
peek-remote: honor proxy config ev
e
n from subdi
r
e
c
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
git-apply: work fr
o
m
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C H
a
ma
n
o
working
from subdir
e
ctory: prep
a
ratio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
bisect: quote pathnam
e
s for eval s
a
fety
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
bisect: limit the
searchspace by pa
t
h
s
pecs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
l
s
-t
r
ee: match t
h
e tes
t
to the new semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
ls-tree: Resurrect funny
n
ame
quoting lo
s
t during
rewrite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torval
d
s
ls-t
r
ee: furthe
r
tweaks of the
rewrite
commit
|
commitdiff
|
tree
2005-11-29
Linus Torva
l
ds
ls-tree:
f
urt
h
e
r
cle
a
nup to
p
arallel ls-
f
iles
.
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
ls-t
r
ee: major rewrite to do pathspec
commit
|
commitdiff
|
tree
2005-11-29
J
unio C H
a
ma
n
o
w
rite_n
a
me_quoted():
make o
n
e
of the pa
t
h a c
o
un
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Ha
m
ano
D
ocument
a
tio
n
:
D
escribe merge operation a bit bet
t
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jan A
n
dres
Fix typo in htt
p
-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
na
m
e-rev: fix parent c
o
unting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
io C Hamano
r
ebase: one safety ne
t
, one
b
ug
f
ix and one optimization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Hamano
M
erge h
t
tp://www
.
k
e
rnel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
git-mv: quote $src in r
e
gexp pro
p
e
r
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C Hamano
config
.
c: constness ti
g
htening to avoi
d
c
omp
i
lation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo:
Do not use -u
=
<
e
ncoding>; sa
y
--encoding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
no
m
a
i
l
inf
o
: Use i18n
.
commitenco
d
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
mano
mai
l
info: a
l
l
ow -u t
o
fall back on latin1 to ut
f
8
con
v
e
rsion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Ham
a
no
Introduce i18n
.
comm
i
tencodin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Y
ann Dirs
o
n
Fix git
k
th
i
s->selected
diffs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Juni
o
C Hamano
Merge http://www
.
ker
n
e
l
.
org/pu
b
/
scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-27
Jo
s
ef
Weidendorfer
g
i
t-m
v
: f
o
llow
-
k request
e
v
e
n on failing re
n
ames
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef W
e
idendorfer
S
m
all fix
e
s in
D
ocumentation
/
git-mv
.
t
x
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weid
e
ndorfer
git-mv: fully detect
'dir
e
ctory mo
v
ed i
n
to itself'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef We
i
dendorfer
git-mv: ke
e
p
g
it
i
n
d
ex con
s
istent with fi
l
e s
y
stem
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weide
n
dor
f
er
git-mv: shrink
usage,
n
o
usage on
error
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
s
e
t
up_g
i
t_d
i
rec
t
ory
(
): check repo
s
i
t
ory
format ve
r
sio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Juni
o
C Ham
a
no
in
i
t-db: check te
m
plate a
n
d repository format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
C
he
c
k repository format version in ent
e
r_re
p
o()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C H
a
mano
R
e
pository format version chec
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C
H
aman
o
f
orm
a
t-patch: output filenam
e
reported to stdout verbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Jun
i
o
C Ha
m
ano
name-rev: f
i
x off-by-one err
o
r in -
-
stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Alexander Litvinov
git
-
mv is not
a
b
l
e
to hand
l
e
b
ig di
r
ectories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
u
nio C Hamano
shel
l
.
c: complain on insufficient
argu
m
en
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Haman
o
g
it-sh-setup: move the repository c
h
eck
to a cor
e
p
r
o
g
ram
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Haman
o
setup_git_director
y
: make sure GIT_DIR is a valid r
e
posi
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
un
i
o C Haman
o
git-var:
m
ake it work in subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Haman
o
git-sh
-
set
u
p: die if outside
gi
t
r
e
positor
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Ha
m
ano
pa
r
se-remote and ls-remote
c
lean-up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
Prevent "git-c
o
mmit -
a
pat
h
1
path2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
unio
C
Hamano
c
o
nfi
g
.
c:
avoid
shadowing global
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIF
U
JI Hidea
k
i
.
.
.
Fix a warning about unuse
d
v
alue
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Andreas Eric
s
so
n
cv
s
import:
Don't
l
et local settings hinde
r
c
v
s
user
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next