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
merge-one-file: make sure we do not mismerge symbolic links.
2005-12-02
Junio C Hama
n
o
m
e
rge-one-file: m
a
ke sure we do not mismerge s
y
m
b
o
lic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hama
n
o
merge-one-file:
m
a
k
e
sure we create the merged f
i
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hama
n
o
t3100: ad
d
ls-
t
ree
-
t and -d tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C H
a
mano
merge-recursive: a
d
ju
s
t
g
it
-
l
s-tre
e
use fo
r
the l
a
test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
n
io C
H
amano
g
i
t-merg
e
-on
e
-file: do
not worry about 'rmdir -p'
not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
unio C Hamano
ls-tr
e
e
: -
-
name-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls-tree: res
u
rrect '-d' to mean 'show trees only'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hama
n
o
M
akefile: s
a
y t
h
e defa
u
lt
t
arget u
p
front
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Ham
a
no
Documentati
o
n
:
de
s
cr
i
be '
-
f'
o
ption
t
o
git-
f
etch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Me
r
ge bra
n
ch '
j
c/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merge
b
r
anches 'j
c
/apply', 'lt/ls-tree'
,
'l
t
/
bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C
Ha
m
ano
Tutori
a
l
: adjust me
r
ge e
x
ample to recursive strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ha
m
ano
m
e
rge-recursi
v
e
: match th
e
unme
r
ged index entry beha
v
iour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
d
iff-files: show d
i
ffs
with
stage0 and unmerged stag
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C H
a
mano
git-diff: d
o
not tu
r
n off -p/-M wit
h
any diff options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Mer
g
e ht
t
p://www
.
kernel
.
org/pub/scm/
g
i
t
k/
g
itk
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
f
o
rmat-patch: run diff in
C
locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
fo
r
mat-patch: do
n
o
t a
b
use 3-dash
ma
r
ker line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
forma
t
-patch: rem
o
v
e
applies-to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ap
p
lyp
a
tch: use "index"
l
ines not
"applie
s
-t
o
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
applymbox: typof
i
x to ena
b
l
e
-m
o
ptio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
hash-
o
bj
e
ct
.
c: t
y
pe
-
fix to sq
u
elch compiler
w
arnings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
define die(
)
for scripts th
a
t
use it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Haman
o
verif
y
-
tag: mak
e
it operable from a subdirect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
t
ag: make it operable from a
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
lost-found
:
make it operable from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Haman
o
branch: mak
e
it operable from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
l
s
-
r
emote:
define
d
i
e() now we do not
use git-sh-se
t
up
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
count-obj
e
c
t
s: make it operable
fro
m
a
s
ubdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
M
a
k
e
t
he rest
o
f commands
w
o
rk
f
rom a
subdi
r
ectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o C
Hama
n
o
Make ne
t
wo
r
king
c
omman
d
s t
o
wor
k
from
a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C H
a
mano
l
s-t
r
ee: work from sub
d
ir
e
c
tor
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Ha
m
an
o
hash-obje
c
t
:
work within
s
ub
d
ire
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Ham
a
n
o
checkout-index: w
o
r
k
from subdir
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ha
m
a
n
o
fsck-ob
j
ect
s
: work
from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
peek-r
e
mot
e
: h
o
nor prox
y
config even
from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
git-apply: work from subdir
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
working from subdire
c
tory: prepa
r
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C Hamano
bisect: quote pathnames for ev
a
l s
a
fety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
uni
o
C Hamano
ls-tree: match the test to the new semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
l
s
-tree: Resurrect
f
unny
n
ame quoting lost dur
i
ng
r
ewrite
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
write
_
n
am
e
_quoted():
ma
k
e one
o
f the path
a
c
o
u
nted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Documentation:
D
escr
i
be
merge o
p
eration a bit better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
name-rev
:
f
i
x par
e
nt counting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
Hamano
r
e
base:
o
ne safety net, one
b
u
g
fix and one optimiz
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
n
io C H
a
mano
Merge ht
t
p
:
//w
w
w
.
kernel
.
o
r
g/pub/scm/gitk/
g
it
k
commit
|
commitdiff
|
tree
2005-11-28
Junio C Haman
o
git-m
v
: quo
t
e
$
sr
c
in
regexp properl
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio C Ha
m
ano
[PATCH]
g
itk:
Use i18n
.
commitenc
o
ding
c
o
n
fi
g
uration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C
Ham
a
n
o
config
.
c: constne
s
s
ti
g
h
t
ening to a
v
oid compilation
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
ma
i
linfo: Do no
t
use -u=<en
c
oding>; sa
y
--e
n
c
od
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo:
Use i18n
.
commitencoding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
mailinfo: allo
w
-u to
fal
l
b
ack
on latin1 to utf8 conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C Ham
a
no
Intro
d
uce i18n
.
comm
i
tencoding
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
M
erge htt
p
://www
.
ke
r
nel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Junio C Haman
o
setup_g
i
t_direc
t
ory(): c
h
eck
r
epos
i
tory format
v
ers
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
init-db: check template and repository forma
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio C H
a
man
o
Check repository form
a
t version in en
t
er_r
e
p
o()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-27
Junio
C
Hama
n
o
R
eposi
t
ory form
a
t version check
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Haman
o
f
o
r
m
a
t-patch: outpu
t
filen
a
me reported to stdout
v
e
r
batim
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Ham
a
n
o
nam
e
-rev:
f
ix off-
b
y
-one error i
n
--stdin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
shell
.
c: complain on insufficient
a
rg
u
ments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
io C Hamano
git-sh-setup: move the
r
epository che
c
k
t
o
a core p
r
o
g
r
am
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C Hamano
s
e
tup_git_directory
:
make sure GIT_DI
R
is
a v
a
lid r
e
positor
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Juni
o
C
H
a
mano
git-var:
m
ake it work in subdir
e
ct
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
H
am
a
n
o
g
it-sh-setup: die
i
f outsid
e
git repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Jun
i
o C Hamano
parse-
r
emot
e
an
d
ls-remote clean-up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
P
revent "git-c
o
mmit -a path1 path2
.
.
.
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Hamano
con
f
i
g
.
c: avo
i
d shadowing
g
lobal
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Juni
o
C Hamano
dif
f
-tree: t
e
ach single-co
m
mit diff-tree to hono
u
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C
H
amano
Teach update-index
t
o read from
l
s-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
J
u
nio C Hamano
git-revert:
m
a
k
e -
-
edit defau
l
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Juni
o
C Hamano
git-mer
g
e: make
recu
r
si
v
e
the default str
a
tegy
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-24
Junio C H
a
m
a
no
pack-
r
edundant: t
y
pe cl
e
anu
p
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
Jun
i
o C
H
aman
o
Merge http://www
.
kernel
.
org/pub/
s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-22
J
unio C Hamano
g
it-v
a
r: constness and globalne
s
s cleanup
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-22
J
unio
C
H
amano
Move
dif
f
.
ren
a
m
e
limit out
o
f
defau
l
t con
f
iguration
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C
Hamano
g
i
t-proxy updates
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Juni
o
C Ham
a
no
daemon: fur
t
her twea
k
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C H
a
mano
tuto
r
ial:
setting up a tree for su
b
s
y
ste
m
maintainers
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Haman
o
rename detecti
o
n
w
ith -M100 means
"
exact r
e
names only"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C
H
amano
f
o
rma
t
-patch
:
fix two-argume
n
t
special case, and make
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C Hamano
Fix hooks/update template
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
J
unio C
H
ama
n
o
M
a
ke sure h
e
ads/foo and tags/foo
d
o n
o
t confuse
things
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Fix "do not DW
I
M
"
patch to enter_repo"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C H
a
mano
M
e
rge htt
p
://www
.
kernel
.
org
/
p
ub/scm/gitk
/
git
k
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
m
e
r
g
e-one
-
fi
l
e: use
rmdir -p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Doc
u
mentation: add h
o
oks/u
p
d
ate example
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Jun
i
o
C Hamano
Do
not DWIM in u
s
e
r
p
a
t
h library u
n
der
s
tr
i
ct
m
ode
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C
Ha
m
ano
http
.
c: reorde
r
to
a
v
oid compilation
failure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C H
a
m
a
no
m
erge
-
rec
u
rsive::rem
o
veFile: rem
o
ve empt
y
direct
o
ries
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
mer
g
e-one-file: r
e
move e
m
pty directories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Documentation: rebase-from-
i
n
tern
a
l minor upda
t
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C
H
a
m
ano
git-repack:
do not do co
m
plex r
e
dunda
n
c
y
che
c
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C
Ham
a
no
gi
t
-co
u
nt-objects: dc replac
e
ment
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
readr
e
fs:
grab a
l
l
refs with one call to
ls-re
m
o
t
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
Merge http://www
.
kernel
.
org/
p
ub/s
c
m/git
k
/gitk
commit
|
commitdiff
|
tree
2005-11-18
Ju
n
io C Hamano
Merge branches
'
jc/
b
ranch' and 'jc/rebas
e
'
commit
|
commitdiff
|
tree
2005-11-18
J
u
nio C Hamano
R
e
write rebase
t
o
use git-for
m
at-patch piped t
o
git-am
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio
C Hamano
gi
t
-branch: -f
to forc
i
b
l
y reset
b
ra
n
ch
head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-18
Junio
C Ham
a
n
o
Do not show
.
exe in git command
l
ist
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next