repo.or.cz
/
git
/
jnareb-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
J
unio C Ham
a
n
o
merg
e
-one
-
file:
m
ake sure we
do
n
ot mismer
g
e sy
m
bo
l
ic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
ni
o
C Hamano
merge-one-file: m
a
ke sure we
c
reate
t
he mer
g
ed fi
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C Hamano
t3100: add ls-tree -t and -
d
t
e
s
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-recursive: adjust
git-ls-tree use for the latest
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
Ham
a
no
git-merge-one-fi
l
e: do not worry about 'rmdir
-p' not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o C
H
amano
l
s-tree: --name-onl
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls-tree
:
re
s
u
rr
e
ct '-d' to mean '
s
how tree
s
only'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
unio C Hamano
Makefile: say th
e
default target upfront
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
H
amano
Do
c
u
mentati
o
n
: describe '-f'
o
ption
t
o git-f
e
tch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o
C Hamano
Merge branch 'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o
C
H
amano
Merge branch
e
s
'
jc/apply',
'
lt/ls-tree',
'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Juni
o
C Ha
m
ano
T
uto
r
ial:
adjust merge example to
r
ecur
s
ive
s
trategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C
Hamano
m
e
rge-recursive: match
t
he unmerge
d
in
d
ex entry behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
unio
C
H
a
mano
diff-files: show diffs
with stage0 and
u
nmerged stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Haman
o
git-
d
iff: do not t
u
rn o
f
f -p/
-
M
with any
di
f
f options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Merge http://www
.
ker
n
el
.
org/pub
/
s
c
m
/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
f
orma
t
-
p
atch: run diff in C
locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C Hama
n
o
f
o
rmat-patch:
do not abu
s
e 3-d
a
sh m
a
rker line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
format-patch: remove appl
i
es
-
t
o
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
appl
y
p
atch
:
use
"
inde
x
" li
n
es not "appli
e
s
-
to"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hama
n
o
appl
y
mbox:
t
ypofix to enable -m option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
h
a
s
h
-
object
.
c:
t
yp
e
-fix to squelch compiler warnings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
mano
define die() for
s
cript
s
that use it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
verify-
t
a
g: mak
e
it operable f
r
o
m
a su
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
tag
:
mak
e
it ope
r
able from a subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
lost
-
fo
u
n
d
: make
it
o
perable
from a subdir
e
c
t
o
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C Ha
m
ano
branch: m
a
ke
it oper
a
ble from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Ha
m
a
no
l
s
-remote: d
e
fin
e
die() now
we do
n
o
t
use git-sh-setu
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
count-objects: m
a
ke 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
he rest o
f
commands
w
o
rk fro
m
a
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
Make network
i
ng 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
Junio C Ham
a
n
o
ls-tree: work from subdi
r
ectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ham
a
n
o
ha
s
h
-object: work withi
n
s
ubdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C
H
amano
che
c
kout-index: wo
r
k from
s
ubdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
fsck-
o
bjects: wo
r
k
from
s
u
b
directory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
un
i
o C Hamano
peek-remot
e
: h
o
nor
proxy config
e
v
e
n
from s
u
bdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C Hamano
git-apply: wo
r
k fro
m
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
working from
subdire
c
tory: preparation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
un
i
o C Hamano
b
is
e
ct: quote
p
ath
n
ames f
o
r e
v
al safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io
C Ha
m
ano
ls-tree: match the test
t
o th
e
ne
w
semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ham
a
no
ls-tree: Resurre
c
t
funny n
a
me
q
uot
i
n
g
l
ost during rew
r
ite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
write_name_quoted(): m
a
k
e
on
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 Ha
m
ano
Documentation:
Describe
merge
opera
t
io
n
a bit
b
etter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
n
ame-re
v
: fi
x
parent c
o
untin
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
Ha
m
a
no
rebase
:
one safety net, o
n
e
bugfix and one optimization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
Merge
h
tt
p
://w
w
w
.
ker
n
el
.
o
r
g/pub/scm/
g
itk/gitk
commit
|
commitdiff
|
tree
2005-11-28
J
unio C
H
amano
gi
t
-mv: quote $
s
rc in regexp
proper
l
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio
C
Hamano
[
PATCH] git
k
:
U
se i18n
.
co
m
mitencoding c
o
nfigur
a
tion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C
H
amano
config
.
c: const
n
e
ss tightening to a
v
o
id compilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio
C Hamano
m
a
ili
n
fo: Do not use
-
u=<enco
d
ing>; say --encodi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C
H
aman
o
mailinfo:
U
se i18
n
.
commi
t
encod
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
io
C Hamano
mail
i
nfo: allow
-
u to fall back
on latin1 to
u
tf8
c
onversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
mano
I
n
t
r
oduc
e
i18n
.
commitenc
o
din
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Merge ht
t
p://www
.
kerne
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
setup_git_
d
irectory()
:
check repositor
y
format vers
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C
Hamano
init-
d
b
:
chec
k
template a
n
d repository fo
r
m
a
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Juni
o
C Hamano
Check repository format version in enter_repo(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C
Hamano
Repos
i
tory format
version check
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
J
unio C Hamano
format
-
patch: output filename reported to s
t
dout ve
r
batim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Ju
n
io C Haman
o
name-rev
:
fi
x
off-b
y
-one e
r
ror
in --stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
J
u
nio C
H
amano
s
h
ell
.
c: c
o
mplain on insuf
f
icient
a
rg
u
m
e
nts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
amano
git-sh-setup: move the
r
epo
s
itory check to a core program
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
se
t
up_
g
it_di
r
ecto
r
y: make su
r
e
G
IT_DIR is a
va
l
id rep
o
sitory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C H
a
m
ano
git
-
var: make it work in subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-sh-setup: die if outside git re
p
o
sitory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o C Hamano
parse-
r
emote and ls-re
m
ote clean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Hamano
Prev
e
nt
"
g
i
t-co
m
mit
-
a path1 path2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
config
.
c:
a
void shadow
i
ng
g
lobal
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Juni
o
C
H
a
m
ano
d
if
f
-t
r
ee: t
e
ac
h
single-comm
i
t
dif
f
-tree to honour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hama
n
o
Tea
c
h
u
pd
a
te-index to read from ls-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Ju
n
io C
Hamano
git-
r
ever
t
: m
a
ke -
-
edit
default
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C H
a
mano
g
i
t-merg
e
:
make
r
ecursive the default
s
t
r
ategy
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
pack-redu
n
d
ant: ty
p
e cleanups
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Junio
C H
a
mano
Merge
h
ttp://www
.
k
e
r
n
e
l
.
o
rg/pub
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-22
Junio C
H
aman
o
git-var: constness an
d
globalness
cle
a
nu
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Junio C Ham
a
no
Move diff
.
re
n
ameli
m
it out of d
e
fault configur
a
ti
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hama
n
o
git-pr
o
xy updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Hamano
da
e
m
on: fur
t
her tweaks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
unio C
H
a
mano
t
utoria
l
:
s
e
tting up a tree for su
b
s
y
stem maintainers
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
unio C
H
amano
rename
d
etec
t
ion with -M100
means "exact renames only
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C Hamano
fo
r
mat-patch: fix two-argument spe
c
ial case, and
make
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C
H
amano
Fix
h
ooks/update template
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C
Haman
o
Make su
r
e heads/foo
a
n
d
t
ags/foo do not confuse things
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Fix "do not DWIM"
p
a
tch to enter_r
e
po"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ha
m
ano
Merg
e
h
t
t
p://ww
w
.
kern
e
l
.
o
rg/pub/sc
m
/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
merge-one-fil
e
: use rmd
i
r -p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
J
u
nio C Hamano
Docume
n
tation: add
hooks/update
e
x
a
mp
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Ju
n
io C Ham
a
no
Do not DWIM in u
s
e
rpath
l
ibrary under
strict mode
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Jun
i
o
C Hamano
http
.
c: reo
r
der to avoid co
m
p
i
lat
i
on failure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio
C
Ham
a
no
merge-recursiv
e
:
:
removeFile:
r
emove empty d
i
re
c
tories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ham
a
no
merge-one-
f
ile: remo
v
e empty dire
c
tories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Ham
a
no
D
o
cumentati
o
n: rebase-from-
i
nternal mino
r
updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
git-r
e
pa
c
k: do
n
o
t
d
o
c
omplex redund
a
ncy check
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
J
unio C
H
amano
git-count-ob
j
e
cts:
d
c re
p
lacement
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Jun
i
o C Hamano
readrefs: g
r
ab all
r
ef
s
with
one call
to l
s
-remote
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Jun
i
o C
H
amano
Merge http://ww
w
.
ker
n
el
.
org/pub/scm/
g
i
t
k/git
k
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
M
e
rge branches
'jc
/
branch' an
d
'
j
c
/
r
ebase'
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Rewr
i
te re
b
ase
t
o
u
s
e git-f
o
rmat-p
a
tch piped to
g
i
t-am
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio
C Hamano
git-
b
ran
c
h: -f
t
o
f
orcibly reset
b
ran
c
h head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Do no
t
sho
w
.
ex
e
in git comm
a
nd list
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next