repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
New test case: Criss-cross merge
2005-12-03
Fredrik
K
uiv
i
nen
New test case: Criss-cr
o
ss merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New test case: merge
wi
t
h direc
t
o
r
y/fil
e
co
n
f
lict
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
d
rik Kuivinen
test-lib
.
sh:
Add new
f
un
c
tion, tes
t
_
expect_code
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-merge:
E
xit with co
d
e
2
i
f no s
t
rat
e
gy was able
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No
n
ame
d
o
c
u
m
entation: git-tag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
documentation:
g
i
t
-bise
c
t (help
HTML b
r
eak man
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No
n
ame
documentation: clarify
read
-
tr
e
e --reset
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o C Hamano
git-merge
d
ocume
n
t
a
tio
n
: conflicting me
r
g
e
leaves h
i
gher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C Haman
o
merge-one-file
:
make
sure we
d
o not
mismerge symbolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Ham
a
no
mer
g
e-
o
ne-file: make sure we c
r
eate the me
r
ge
d
file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Hamano
t3100: add ls-tre
e
-t and -d t
e
sts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C Hamano
merge-recursive: adjust g
i
t-ls-tree use for the latest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ale
x
Riesen
git wrapper:
m
ore careful argum
e
n
t
stuffing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C Hamano
git-merge-one-file:
d
o
n
ot worry about 'rmd
i
r -p' not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io C Hamano
ls-
t
ree: --name-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
Hama
n
o
ls-tree: resurr
e
ct '-d' to mean 'show trees only'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Linus T
o
rvalds
git-l
s
-tree: add "-t" optio
n
to al
w
ays
s
how the tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Ju
n
io
C
Hamano
Ma
k
efile: say the default target upfront
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C
Ham
a
n
o
Docume
n
tation
:
describe '-
f
' opti
o
n to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Timo
H
irvonen
Move co
u
ple of ifdefs
afte
r
"inc
l
ude config
.
mk"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C Hamano
Merge branch '
j
c/subdir'
commit
|
commitdiff
|
tree
2005-11-30
J
unio C Hamano
Mer
g
e
b
ranches 'jc/apply', '
l
t/l
s
-tree',
'lt
/
bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
T
o
mmi Virtanen
Do not attempt
t
o access
l
i
teral dir
n
ame "GIT_OBJECT_
D
I
R
E
CTO
R
Y"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tut
o
r
i
al: a
d
just merg
e
exa
m
ple to recu
r
sive strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
merge-recu
r
sive: match t
h
e
unmerged index e
n
try b
e
h
a
v
iour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hama
n
o
d
iff
-
fi
l
es: show diffs w
i
t
h
stage0 and unmerg
e
d stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
merge-
o
ne
-
f
i
le: leave unmer
g
ed i
n
d
e
x entr
i
e
s upon a
u
tomer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
d
i
f
f
-file
s
: -1/-2/-
3
to diff against u
n
merged
s
tage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hama
n
o
git-diff: do not
t
urn
off
-
p
/-M with any diff o
p
tions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
M
erge http://www
.
kernel
.
or
g
/pub/
s
cm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex Riesen
[PATCH
]
Add
tests for git-
m
v in
s
ubd
i
recto
r
ies
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 Schindelin
[
PATCH] Make git-mv work i
n
subdirectories, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C Hamano
f
o
rmat-patch:
r
un diff in C locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
format-patch: d
o
not
a
b
u
se 3-dash marker lin
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format-patch:
remove applie
s
-to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C Hamano
a
p
plypatch: us
e
"in
d
e
x
"
lines not "a
p
plies-
t
o"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
applymbox: typo
f
ix t
o
e
n
a
ble -m optio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Matthias Urlich
s
SVN import: Use one log call
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jdl@freescale
.
c
om
Fix typ
o
s and minor for
m
at
issue
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Nick H
e
ngeveld
htt
p
-push clean
u
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pave
l
Roskin
git-clone
--shared s
h
o
u
ld impl
y
--local
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
hash-object
.
c: type-f
i
x to squelch compiler warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C
H
amano
d
e
fi
n
e die() fo
r
scr
i
pts that use it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
verify-tag: make it operable from a
s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
t
a
g:
make it
o
perable from a subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C
H
amano
lost-
f
ound: make it operable
f
rom a subd
i
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
branc
h
: make it
o
perable from a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C
Hamano
ls
-
r
e
m
o
te
:
d
e
fine die() n
o
w
w
e
d
o not use git-sh-setup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
count-obje
c
ts:
m
ak
e
it ope
r
abl
e
from a sub
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
M
a
k
e
t
he rest
o
f
commands work fro
m
a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
Mak
e
net
w
or
k
i
n
g
commands to
work from a su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
ls-tree:
w
o
rk
from subdirec
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hama
n
o
ha
s
h-ob
j
ect: work w
i
thin subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Haman
o
checkout-index: work from subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
ama
n
o
fsck
-
o
bje
c
t
s
:
w
o
rk
from
s
ubdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
man
o
peek
-
remote: hon
o
r
proxy
co
n
f
i
g eve
n
from su
b
d
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
git-
a
pply: work
f
rom subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ham
a
no
w
orking
f
r
om subdirectory: prepa
r
atio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
bisect: quote p
a
t
h
names for eval safe
t
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linu
s
T
o
rvalds
bisect:
l
imit t
h
e s
e
archs
p
ac
e
b
y pathsp
e
c
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C
H
amano
ls-tree: matc
h
t
he test
t
o
the ne
w
semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C H
a
mano
ls-tree: Resurrect funny name qu
o
ti
n
g lost during re
w
rite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus
T
o
rv
a
l
d
s
ls-tree: furthe
r
tw
e
aks of the
r
ewrite
commit
|
commitdiff
|
tree
2005-11-29
L
inus
T
orvalds
ls-tree: further c
l
eanu
p
t
o
p
arallel l
s
-files
.
commit
|
commitdiff
|
tree
2005-11-29
Li
n
us Torva
l
ds
ls-tree:
maj
o
r
re
w
rite to do pathspec
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io
C
Haman
o
write_nam
e
_
q
uote
d
(): make
one
o
f
t
h
e path a counted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
m
ano
D
o
c
umentation: De
s
c
ribe
m
erge operation a bit better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jan Andres
Fix t
y
po
i
n ht
t
p-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
n
ame-
r
e
v
: fix parent c
o
un
t
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
rebase:
o
ne safety net, one bugfi
x
and one
o
pti
m
ization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
Hamano
Merge http://www
.
kernel
.
org/pub
/
scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
g
it
-
mv: quote $src
in regexp p
r
operly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
mano
con
f
i
g
.
c: co
n
stn
e
s
s
tightening
to avoid c
o
mpil
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
m
ailinfo:
D
o not use -u=<enc
o
d
i
n
g>; s
a
y --encodin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
io C
Ham
a
n
o
m
ailinfo: Use i18n
.
commit
e
n
co
d
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
ma
i
l
info: allow -u to
fall
b
ac
k
on la
t
in1 to ut
f
8 convers
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
Ha
m
ano
Introduce
i18n
.
com
m
itencodi
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Ya
n
n Dirson
Fix gitk this->selected diffs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C Hamano
Merge http://www
.
kerne
l
.
org/pub/scm/gitk/git
k
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
git-mv: f
o
llow -k request eve
n
on
f
a
i
li
n
g renames
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Jo
s
ef Wei
d
endo
r
f
e
r
Sm
a
ll
f
ixes
in Documentation/git-mv
.
t
x
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Jos
e
f Weidendorfer
g
i
t
-
m
v
:
fully
d
et
e
ct 'direc
t
ory m
o
ved
into its
e
l
f
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
git
-
mv: kee
p
gi
t
inde
x
co
n
sistent with file system
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Josef
Wei
d
e
ndorfe
r
git-mv: sh
r
i
nk usage, no
u
sage on error
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
setup_git_directory(): check
repository fo
r
m
a
t version
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
init-
d
b: ch
e
ck template and repo
s
itory format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C H
a
man
o
Chec
k
repository format version
in en
t
er_re
p
o()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Jun
i
o C
H
ama
n
o
Repository format version check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
for
m
at-p
a
tch: o
u
tput filename
repor
t
ed to stdout verbatim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Ham
a
no
name-rev: fi
x
off-
b
y-one error in --stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Alexander Litvinov
git-mv
i
s not a
b
le to handle big d
i
rectories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C Hamano
s
h
el
l
.
c
: com
p
lai
n
on i
n
sufficient
arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C
H
a
mano
g
i
t-sh-setu
p
: 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 Hamano
s
e
tup_
g
it
_
directory: make sure G
I
T_DIR is
a
v
alid repositor
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Ha
m
ano
git-var: make
i
t work in su
b
directo
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio
C
Hamano
git-sh-setup: die
i
f
o
utside git rep
o
s
itory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
io C Hamano
parse-remote and ls
-
r
e
mote clea
n
-
u
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Hamano
P
re
v
ent "git-commit
-a path1 pa
t
h
2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Ham
a
no
c
o
nfig
.
c:
avoid
shadowing global
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
YOSHI
F
UJI Hideaki
.
.
.
Fix a warning about unus
e
d va
l
ue
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next