repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t/t6022: a new test for renaming merge.
2005-12-11
Junio C Hamano
t/t60
2
2: a ne
w
test
f
or renaming merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Ju
n
io C Hamano
mer
g
e-rec
u
rsive
:
cleanup setI
n
dexStages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Junio C
H
a
mano
merge-recursive: leave unmer
g
ed entries in
t
he
i
ndex
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Junio C Hamano
format-patch: use same number o
f
di
g
its in num
b
e
r
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Junio C Hamano
t
0
000
:
catch tr
i
via
l
pilot errors
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Junio C Hama
n
o
t3300: funny name test
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-10
Junio C Hamano
Link Ever
y
day GIT to main
d
ocumentation
t
re
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-10
Junio
C
H
am
a
n
o
Everyday
G
IT with 20
c
omman
d
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-10
Junio C Hamano
Use
GIT_EXEC_P
A
T
H explicitly
f
or initial git-
i
nit-db
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
Junio C H
a
mano
g
it-prune: nev
e
r lose object
s
r
e
achable from our r
e
fs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
J
u
nio C Hamano
q
sort(): ptrdiff_
t
may be larger tha
n
i
n
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
Junio C Haman
o
Documenta
t
ion: git-prune
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Ju
n
io C Hama
n
o
show-bra
n
c
h
: comment typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
J
u
n
io
C
H
amano
Doc
u
men
t
ati
o
n: recursive
i
s
the default st
r
at
e
gy thes
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
Ma
k
e sure w
e
use
comp
a
t/sub
p
r
oces
s
.
py with Py
t
hon 2
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Ju
n
io C Hamano
refs
.
c:
m
ake sur
e
le
a
ding
d
irec
t
or
i
e
s exist before
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C
Haman
o
Documentation
(
tutorial): adjust
merge example to the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hama
n
o
Docume
n
tation(cvs-migration): minor
c
le
a
nup
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
J
unio C Hamano
Docume
n
tation(glossary)
:
mino
r
f
ormatting clean-ups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
Documentati
o
n: git
.
h
t
m
l/git
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
Merge http://www
.
kerne
l
.
org/pub/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2005-12-07
Junio C
H
amano
updat
e
-index:
a
llow -
-
index-i
n
f
o to add higher
stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Jun
i
o
C Hamano
git-merge
-
o
n
e: new mer
g
e
world order
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Ju
n
io C Hamano
che
c
kout-ind
e
x
:
allow che
c
king
out from higher stag
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Ju
n
io C Hamano
qsort() ptrdiff_t may be larger than int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C
H
amano
git
-
merge-one-file: res
u
r
r
ect lea
d
ing path creation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C
Hama
n
o
Documentaiton (
r
e
ad-
t
r
ee):
update description of 3-way
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C
Hama
n
o
D
o
c
umentation: hash-
o
bj
e
ct
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C Hamano
w
r
it
e
-tree: check extra
argumen
t
s and d
i
e but
b
e a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hama
n
o
in
i
t-db: check extra arguments
and complain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio C
Hamano
hash-object
:
-- an
d
--he
l
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
unio C
H
amano
git-mv to work with Perl 5
.
6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hama
n
o
Fix 5501 test
Signed-off-by:
Junio C Hamano
<junkio@twinsun.com>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C Hamano
Clean up co
m
pati
b
ilit
y
definition
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Hamano
conf
i
g
.
c: rem
o
ve unnecessa
r
y
h
eader
i
n
min
i
m
um
configuratio
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
s
e
rver-info
.
c:
and two
f
uncti
o
ns are not used anym
o
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o
C
Hamano
ser
v
er-info
.
c: use pack_local like ever
y
body else
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
D
o
cumenta
t
ion: shared rep
o
s
itory
manage
m
ent in tuto
r
i
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C H
a
mano
Documen
t
ation
:
push/recei
v
e hook refer
e
nces
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hamano
Doc
u
mentation: git-diff as
c
iidoc tab
l
e workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documenta
t
ion: git-mv ma
n
page
workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
D
o
cu
m
ent
a
tion
:
talk ab
o
u
t
p
a
th
s
pec in bisect
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
se
r
ver-info
:
t
h
row away T comp
u
tation as we
l
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Haman
o
s
erv
e
r-info: st
o
p
s
ortin
g
packs by latest d
a
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C H
a
m
a
no
server-info
.
c: drop
unused D lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Haman
o
s
h
a1_fil
e
.
c: make
s
ure
p
acks in an alterna
t
e odb is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
git
.
c: remove e
x
ce
s
s output for debu
g
ging when command
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
struct
tre
e
: remove unused field "parent"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io C Hamano
Do
c
umentation:
r
ebase does not use cherry-p
i
ck anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
i
o C Hamano
s
how-
b
ranch: allow
g
lob pat
t
e
r
n to n
a
me branches to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Hama
n
o
git
.
c
:
two
f
ixes, gitsetenv
type and off-by-one error
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Haman
o
compa
t
/
s
e
t
env
:
do
no
t
free
w
hat we fed putenv(3)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Juni
o
C Hamano
[PATCH] daemon
.
c and path
.
enter_repo(): revamp
p
ath
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Hama
n
o
docu
m
entation: gi
t
-
bisect (
h
e
lp HTML b
r
eak
m
an)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C H
a
mano
g
i
t-m
e
rge docu
m
e
ntation: conflicti
n
g me
r
ge l
e
aves higher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o C Ham
a
no
merge-one-file: make sure
w
e do not
misme
r
g
e symb
o
l
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-one
-
file: make
s
ure we
c
reate the
m
erged file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
t3100:
a
dd ls-t
r
ee
-t a
n
d -d tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o C
H
amano
merge-recurs
i
ve: adjust gi
t
-ls-tree us
e
for the latest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
aman
o
gi
t
-m
e
rg
e
-one-file: do not worry about 'rmdir
-
p' not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls
-
tree: --
n
ame-on
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
un
i
o C
Hamano
ls-
t
ree: res
u
r
r
ect '-d' to mean 'sho
w
tre
e
s only'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
Makef
i
l
e
: say the default tar
g
et upfro
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
D
ocumentation: describe '-f' op
t
io
n
t
o git-fet
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ha
m
a
n
o
Merge branch 'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merge branche
s
'jc/apply', 'lt/ls-tree', 'lt/bis
e
ct
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C Hamano
Tutorial:
ad
j
u
s
t
merg
e
example t
o
recursi
v
e strateg
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
Hamano
merge
-
recursive: match th
e
u
n
me
r
ged in
d
ex en
t
r
y beha
v
iour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C
H
amano
dif
f
-
f
il
e
s:
s
how diffs wit
h
stage0
and
u
nmer
g
ed st
a
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
a
m
an
o
git-diff:
do
not turn off -p/-
M
with any diff options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hamano
M
erge http://www
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
format-pa
t
c
h
: run diff i
n
C loc
a
le
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
mano
format-patch: do not abuse 3-dash marker li
n
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format-
p
atch
:
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 Hama
n
o
applypat
c
h: use "i
n
dex"
l
in
e
s not
"
applies
-
to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
app
l
ym
b
ox:
typofix to enable
-m option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o C Hamano
hash-
o
bject
.
c: typ
e
-fix to s
q
uelch
c
ompiler warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
define die() for scr
i
pts
that
u
se it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
verify
-
tag:
make it operable from
a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C
H
a
mano
tag:
m
a
k
e
i
t
operable from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
l
ost-found: make it
o
pe
r
able from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
branch:
m
a
k
e
it ope
r
a
b
le fr
o
m a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C H
a
mano
ls-remo
t
e
: de
f
in
e
di
e
() no
w
we do
not use git-sh-setup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
count-objects: make it operable f
r
o
m a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
M
ake the rest
of commands work from a
sub
d
irecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
a
mano
M
a
k
e netw
o
rking commands to work from a
s
ubdir
e
cto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
H
am
a
no
ls
-
tr
e
e: w
o
r
k
from
s
ub
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Ha
m
ano
hash-obje
c
t: work within subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
ni
o
C Hamano
checko
u
t-ind
e
x: work
from subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hama
n
o
fsck-objects:
work
f
rom subdirec
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o
C Hamano
peek-remote: honor proxy
c
onfig ev
e
n from subdire
c
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
git
-
apply: work from
s
ubdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio
C
Hamano
wor
k
ing from subdi
r
e
c
tory:
p
r
eparation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
amano
bise
c
t: quote pathname
s
for eval safet
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ls-tre
e
: mat
c
h the test
to the
n
ew
semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Ha
m
a
n
o
ls-tree: Re
s
urrect funny name qu
o
t
i
n
g
lost during rewrite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
wr
i
te_na
m
e_
q
uoted():
m
ak
e
one of t
h
e path a counted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
uni
o
C Haman
o
D
o
cumentation: Descr
i
be merge o
p
erati
o
n a bit bette
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
na
m
e
-
rev:
f
ix par
e
nt
c
o
u
n
ting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
rebase: one s
a
f
ety ne
t
, one b
u
gfix a
n
d on
e
o
ptimization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next