repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t3200: branch --help does not die anymore.
2005-12-03
F
redrik
K
uivinen
New tes
t
case:
C
riss-
c
ross
me
r
ge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Kuivin
e
n
New t
e
st case:
m
erge wi
t
h
directory/file co
n
flict
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
Kuivi
n
en
test-lib
.
sh: Add new functi
o
n, test_expect_code
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik K
u
ivinen
g
i
t-merge: Exit with code 2 if no
s
t
rate
g
y was able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No na
m
e
document
a
t
ion: git-tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C H
a
mano
documentati
o
n: git-
b
isect (help HTML break
man)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
N
o
name
document
a
t
i
o
n:
clarify read-tree --reset
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C Hamano
git
-
me
r
ge
d
o
cumen
t
ation: con
f
licti
n
g merge
leaves hi
g
her
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-one-file: ma
k
e s
u
r
e
we do not
m
ismerge s
y
mbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Hamano
merge-one-file:
make su
r
e we create
t
he merged file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Hamano
t3100: a
d
d ls-
t
re
e
-t and
-d tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
m
e
r
ge-recursive: adjust git-ls-
t
ree u
s
e fo
r
the lat
e
st
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Alex Rie
s
e
n
git wrapper: more
c
arefu
l
argument
st
u
ffin
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C H
a
mano
git
-
merg
e
-on
e
-file:
d
o
not w
o
rry ab
o
u
t
'rm
d
i
r
-
p' not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Ham
a
n
o
l
s
-tree
:
--name-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C H
a
mano
ls-
t
ree
:
resurrect '-d
'
to m
e
a
n
'show trees only'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Linus Torvald
s
git-ls-
t
ree: add "-t" optio
n
to alw
a
ys show the
t
r
ee
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
u
n
io C
H
amano
Makef
i
l
e
: say
the d
e
fault
target upfront
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio
C
Hamano
Documentation: descr
i
be '-f'
o
p
tion
t
o g
i
t
-
fetc
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Timo H
i
rvonen
Mov
e
couple of
ifd
e
f
s af
t
e
r
"in
c
l
u
de c
o
nfig
.
mk"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
unio C
H
am
a
no
Mer
g
e b
r
anch 'jc/su
b
dir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ha
m
ano
Merg
e
bra
n
che
s
'jc/appl
y
', 'lt
/
l
s
-
t
ree'
,
'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
T
o
m
m
i Vi
r
ta
n
e
n
D
o
n
o
t
attempt
to access lite
r
al dirname "GIT_OBJECT_D
I
RECTORY"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
a
mano
Tu
t
orial: a
d
just mer
g
e example to recursive strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C Hamano
me
r
ge-recursive:
m
atch
t
he
unmerged index entry behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
a
m
a
no
diff-
f
iles: sh
o
w diffs
w
ith st
a
g
e
0
an
d
unmerged s
t
age
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
L
in
u
s T
o
rvalds
merge-one-
f
i
le: leave unmerged
i
ndex entries upon automerge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
L
i
nus
Torvalds
diff-files: -1/-2/-3 to
diff against unmerged stag
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
a
m
ano
git-di
f
f:
do
n
o
t
t
u
rn off
-
p/
-
M wit
h
a
ny diff opti
o
n
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C
H
amano
Merge http
:
//www
.
kernel
.
org/pub/sc
m
/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex
Rie
s
en
[PATC
H
] A
d
d tests f
o
r git-m
v
in subdirectories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Joha
n
nes Schind
e
lin
[
P
ATCH] Ma
k
e git-mv wo
r
k in s
u
b
di
r
ectorie
s
, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
am
a
no
format-patch: run
di
f
f
in
C
locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
fo
r
mat-patch: do no
t
abuse 3-dash marker
l
ine
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
format-pa
t
ch: remove applies-to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
applypatch: use
"index" lines not "
a
pplies
-
to"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
applymb
o
x: t
y
pofix to en
a
ble -m opti
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matthias Url
i
chs
SVN import:
Use one lo
g
c
all
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
j
dl@freescale
.
com
Fix
t
ypos and minor f
o
rmat issues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ni
c
k
H
engeveld
http-p
u
sh cle
a
nup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Roskin
git-clone
-
-shared sh
o
u
l
d imply --loca
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
hash-objec
t
.
c: type-fix to s
q
uelch comp
i
le
r
warnings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
define die() for
sc
r
ipts
t
h
at use i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
verify-tag:
mak
e
it op
e
rable
f
rom a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
tag
:
mak
e
it operab
l
e
f
rom a s
u
bdire
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
lost-found: make i
t
operable f
r
om a sub
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Haman
o
branch: make it oper
a
ble
from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
ls-remote: d
e
fine die() now we do n
o
t use
git-sh-
s
etup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
c
ount-
o
bje
c
t
s: m
a
ke it operable f
r
om a subd
i
rect
o
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C
H
amano
Make t
h
e
r
est of commands
w
ork from a sub
d
ir
e
ct
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
ni
o
C
Hamano
Ma
k
e networking commands to work fro
m
a subdir
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
amano
ls-tr
e
e: work from
s
ub
d
ire
c
t
o
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
hash-ob
j
e
c
t
:
work withi
n
sub
d
ir
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C Hamano
ch
e
ckout-i
n
dex: work from subdire
c
to
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Ham
a
n
o
fsck-obje
c
ts: work fr
o
m sub
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C Hamano
peek-r
e
mote: h
o
nor pr
o
xy con
f
ig
e
ven from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C
Ha
m
ano
git-apply: work from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Ha
m
ano
workin
g
from subdir
e
ctory: preparati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C H
a
mano
b
isect: q
u
ote pathn
a
mes for eval safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
bi
s
ect: limit the
s
earchspace by pathsp
e
cs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-tree
:
match the te
s
t to th
e
new
s
e
mantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
ls-tree:
R
e
s
ur
r
ect
fun
n
y nam
e
quoting lo
s
t du
r
i
n
g r
e
write
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
L
i
n
u
s
Torvalds
ls-tree: furth
e
r tweaks of the
r
ewrite
commit
|
commitdiff
|
tree
2005-11-29
Linus Torva
l
d
s
ls-t
r
ee:
f
urth
e
r
cl
e
anup to par
a
llel
l
s-f
i
les
.
commit
|
commitdiff
|
tree
2005-11-29
Li
n
us Torva
l
ds
ls-
t
ree: m
a
jor rewrite to do pathspec
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
write_name_quoted(): m
a
ke o
n
e of the
pat
h
a
co
u
nted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
Doc
u
mentation
:
D
e
scribe merge o
p
eratio
n
a bit bet
t
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
an Andres
Fi
x
t
ypo i
n
http
-
push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
n
a
me
-
rev: fix parent countin
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
i
o C Hamano
r
ebase: one safety net, one bu
g
fix and one opti
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/
p
ub/scm/gi
t
k/
g
it
k
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C Hamano
git-mv:
quote $src in
r
egexp properly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Hamano
config
.
c
:
co
n
stness tighteni
n
g t
o
av
o
id compilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
uni
o
C
H
amano
m
ailinfo: Do not u
s
e
-
u=<enco
d
in
g
>; say
--encoding
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo: Use
i18n
.
c
o
mmi
t
e
n
coding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo: allow -
u
to fa
l
l back on latin1 to u
t
f8 conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Int
r
oduce i18n
.
co
m
mi
t
encoding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Yan
n
D
i
r
son
Fix gitk this->selected diffs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Merge http://www
.
ke
r
nel
.
org/pub/sc
m
/git
k
/gitk
commit
|
commitdiff
|
tree
2005-11-27
J
osef
Weidendorfer
git-mv: follow -k request even on f
a
iling renames
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jose
f
Weidendorfer
Small fixes i
n
Docume
n
tati
o
n
/git-mv
.
tx
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Wei
d
end
o
rfer
git-m
v
: fully detect
'
di
r
ectory
moved i
n
to itself'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weid
e
ndorfer
git-mv: keep g
i
t index consiste
n
t with file system
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef
W
eiden
d
or
f
e
r
g
i
t-mv: shrink usag
e
, no usage on error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C Hamano
setup_gi
t
_directory(): chec
k
repository format version
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Ham
a
n
o
i
nit-db: check template and repository
form
a
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Check
repos
i
tory format ve
r
sion in
e
nter_repo
(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Haman
o
Repos
i
tory format
vers
i
on ch
e
ck
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
f
orma
t
-patch: outpu
t
filenam
e
rep
o
rted to
std
o
ut verbatim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
name
-
r
e
v
:
f
i
x
o
f
f-by-one error in
-
-stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Alexander Litvinov
git-mv is n
o
t abl
e
to handl
e
big directories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C H
a
mano
s
hell
.
c: c
o
mplain o
n
i
n
s
u
f
ficient
arg
u
me
n
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o C Hamano
git-sh
-
set
u
p
: m
o
v
e
t
he repository
c
heck to
a
core
p
rog
r
am
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
setup_git_d
i
r
ec
t
ory:
m
ake sure GIT_DIR i
s
a valid repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-var: make it work in su
b
d
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-sh-s
e
tup
:
die if outside gi
t
repo
s
itory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Hamano
parse-remote
a
nd ls-remote
clean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
Preve
n
t
"
git-co
m
mit -a
p
ath1 path2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o
C
Ha
m
ano
c
o
nfig
.
c: avo
i
d
shadow
i
ng glo
b
al
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
YOSH
I
FUJI Hideak
i
.
.
.
F
i
x a warning about
unused value
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next