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
merge-one-file: make sure we do not mismerge symbolic links.
2005-12-02
Junio C H
a
mano
m
erge-o
n
e-file: make sure we d
o
not mismerge symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Hamano
merge-one-file:
m
a
ke sure we
c
reat
e
the
m
erged file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
t3100: add
ls-tree -t an
d
-
d tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ham
a
no
merge-r
e
cursiv
e
:
adjust
g
i
t-ls-tree u
s
e for the latest
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Alex Riesen
git wr
a
pper: more c
a
reful ar
g
ume
n
t stuffing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
git-m
e
rge-one-file: do not
w
orry abou
t
'rmdir
-p'
not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio C H
a
m
a
no
l
s
-
t
re
e
: --n
a
m
e
-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls-tr
e
e
: resurrect '-d'
to mean 'show tr
e
es only
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Linus Torvalds
g
it-ls-tre
e
:
add "-t"
opt
i
on to always
s
h
ow the
t
ree
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C Hamano
Makefile: say
t
he
d
efault target upfron
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
unio C
Hamano
Document
a
tion:
d
e
s
c
ribe '-f' op
t
ion to git-fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Timo
H
i
r
vonen
Move couple of ifdefs aft
e
r "i
n
clu
d
e config
.
m
k
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C
Hamano
Merge branch 'jc/sub
d
ir'
commit
|
commitdiff
|
tree
2005-11-30
J
unio
C
Hamano
Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi
V
irtanen
Do not atte
m
pt to access lit
e
ral dirname "G
I
T_OBJEC
T
_
D
IRE
C
TORY
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C
Hama
n
o
Tutorial: adjust merge ex
a
mple to recursive strate
g
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C Hamano
me
r
ge-r
e
cur
s
ive: match the unm
e
rged index ent
r
y
behavi
o
ur
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Hamano
d
i
ff-files: show di
f
fs with stage0
and unm
e
rged stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
L
i
nus Torvalds
m
e
rge-
o
ne-
f
ile: leave unmerged
i
ndex entries upon auto
m
erg
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linus
Tor
v
a
l
ds
d
iff-fi
l
e
s
: -
1
/-2/-3 to diff against unmer
g
ed s
t
ag
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Hamano
git-diff: do
n
ot
t
u
rn off -p
/
-M with
a
ny diff options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
Merge http://www
.
kerne
l
.
org
/
p
u
b/sc
m
/
gitk
/
gitk
commit
|
commitdiff
|
tree
2005-11-29
A
l
ex Riesen
[PATCH
]
Add t
e
s
t
s
for g
i
t
-mv
i
n
s
ubdirec
t
o
r
i
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Johannes Schin
d
elin
[
P
ATCH] Make git-mv wor
k
in subd
i
recto
r
ie
s
,
t
o
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Ha
m
a
n
o
format-pa
t
c
h:
ru
n
diff in C locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
format-patch
:
do not abuse 3
-
d
a
sh
m
arker line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
fo
r
m
a
t
-
p
a
tch: remove
applies
-
to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Ham
a
n
o
applypatch: us
e
"in
d
ex" li
n
es no
t
"applies
-
t
o"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
appl
y
mbox
:
typofix to en
a
b
le -m op
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Matthias Urli
c
hs
SVN im
p
o
r
t:
Use one l
o
g cal
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
j
d
l@fre
e
scale
.
com
Fix typ
o
s
a
nd mi
n
or
f
ormat issue
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
N
i
ck He
n
gev
e
l
d
http-pu
s
h c
l
eanup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Pavel
R
o
skin
git-clone --sh
a
red sh
o
u
l
d imply --local
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ham
a
n
o
h
ash-o
b
ject
.
c
:
type-fix to squelch compiler
w
arnings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
d
e
fine die() for s
c
ripts
t
hat use
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Haman
o
veri
f
y
-tag: make it oper
a
ble
fro
m
a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
tag: mak
e
it op
e
r
a
bl
e
from a subdirec
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C Hamano
l
o
st-found: m
a
ke i
t
op
e
rable fr
o
m a
s
ubdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
br
a
n
c
h:
make i
t
o
perable fr
o
m a su
b
d
i
re
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C H
a
mano
ls-remote: define die() now w
e
d
o
not us
e
git-sh-se
t
up
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
count-objects: m
a
k
e
i
t op
e
rable
f
rom a
s
ubdire
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C
Hamano
M
a
ke the r
e
s
t
of c
o
mm
a
n
d
s
wo
r
k from
a
su
b
dire
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
m
ano
Mak
e
n
e
tw
o
rk
i
n
g
commands
to work from a
s
ubdi
r
ectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-t
r
ee:
w
ork from su
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
hash-object:
work
within subd
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
che
c
kout-i
n
dex: work f
r
om subd
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
amano
fs
c
k-objects: work fr
o
m subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
pee
k
-remote: h
o
nor proxy
config even fro
m
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
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
working fro
m
subdir
e
ctory:
p
reparat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
bise
c
t: quote pathnames
f
or eval safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
bis
e
ct: l
i
mit the searchspace by pathspecs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C H
a
m
a
n
o
ls-tree: mat
c
h the test to the new semanti
c
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Ha
m
an
o
l
s
-tr
e
e: Resu
r
rect fun
n
y name quoting
l
o
st during rewrite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Lin
u
s Torvalds
l
s
-
t
ree: furthe
r
twea
k
s of the rewrite
commit
|
commitdiff
|
tree
2005-11-29
Linus
Torvalds
ls
-
t
r
ee: further cl
e
anup to paral
l
el ls-files
.
commit
|
commitdiff
|
tree
2005-11-29
Linus T
o
r
v
alds
ls-tree: major
r
e
writ
e
to do path
s
p
ec
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
write_name_quote
d
():
m
ake
one
of
the
path a counted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Ha
m
a
no
Documentation: D
e
s
c
rib
e
merge o
p
eration
a
bit
b
ett
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jan Andres
Fix typo in h
t
tp-push
.
c
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
name-rev:
fix par
e
n
t
counting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Hamano
rebas
e
:
o
ne safety net,
o
n
e
b
ugfix and
one optimization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
ma
n
o
M
erge http://ww
w
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
git-mv:
q
uote $
s
rc i
n
r
egexp prope
r
ly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
a
n
o
config
.
c: constness tightening to avoi
d
c
ompilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C Ham
a
no
m
ailinf
o
:
Do not use -u=<encoding>; say --encoding
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo: U
s
e i18n
.
commitencoding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
Hamano
mailinfo: allow -u to fall back on la
t
i
n1 to
utf8 conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
m
ano
Introduce i18n
.
comm
i
te
n
coding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Yann Di
r
son
Fi
x
gitk this->selected
di
f
fs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
uni
o
C
Hamano
Merg
e
http
:
/
/
www
.
kern
e
l
.
org/pub
/
scm/gitk/git
k
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfer
git-mv: follow -k re
q
uest even on f
a
ili
n
g renam
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef Weidendorfe
r
Small fixes
in Docum
e
ntati
o
n/git-mv
.
t
xt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jo
s
ef Weidendorfer
gi
t
-mv: fully detect 'directory moved
into itself'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef
W
eiden
d
orfer
gi
t
-mv: keep
git index
con
s
istent with file syste
m
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Josef W
e
idendorfer
git
-
mv:
s
hrink usage,
n
o usage on
erro
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Jun
i
o C
H
amano
setu
p
_git_dir
e
ctory(): check
r
epo
s
itory format versi
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
H
a
mano
init-db: check temp
l
a
t
e and repositor
y
format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio
C Haman
o
Check repositor
y
format version in enter_
r
epo()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Repository format version
c
heck
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C H
a
mano
form
a
t-patch: outpu
t
f
i
l
ename report
e
d
t
o stdout ver
b
atim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Ju
n
io C Hamano
n
ame-re
v
:
f
ix off-by-one error in --stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Alex
a
nder
L
itvinov
git-mv is not able
to handle big directories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
J
u
n
i
o C Hamano
shell
.
c: complain
o
n
insuffici
e
nt arguments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o C Hamano
g
i
t-sh-set
u
p:
m
o
ve
t
he repository check to
a core p
r
o
g
ram
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Ham
a
no
setup_git_d
i
r
e
ctory:
ma
k
e sure GI
T
_DIR
i
s a valid repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
g
it
-
var: make it work in
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Ham
a
no
g
i
t
-
s
h-setup: die if outside git r
e
p
osit
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
parse-r
e
mote and ls-remo
t
e cl
e
an-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o
C Hamano
Prevent "git-
c
ommit -a path1 path2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Haman
o
config
.
c: a
v
oid shadowing global
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
YOSHIFUJI Hide
a
ki
.
.
.
Fix a warning about unused
v
alue
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
A
ndrea
s
Ericsson
cvsimpo
r
t
:
Don'
t
let local settings hinde
r
c
v
s us
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Johannes Schindelin
Rename git-conf
i
g
-set to
g
it-re
p
o
-
config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
unio C Hamano
diff-tre
e
: tea
c
h single-commit diff-
t
ree to
h
onour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
unio C Hama
n
o
Teach update
-
index to rea
d
from ls-t
r
ee
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
git-reve
r
t: m
a
k
e
--ed
i
t defaul
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Linu
s
Torv
a
lds
Allow editing
of a revert-mes
s
a
ge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Josef Weidend
o
rf
e
r
F
ix git-mv for
m
ov
i
ng dire
c
t
ories wi
t
h 1 fil
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
unio C Hamano
git-merge:
make recursive the def
a
ult strategy
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next