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
merge-recursive: leave unmerged entries in the index.
2005-12-11
Junio C Hamano
m
erge-recursi
v
e: leav
e
unmerge
d
entries i
n
the index
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
J
u
nio C
H
amano
fo
r
m
at-pa
t
ch:
u
se same number of digits in numbers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
J
u
nio C Hamano
t0000: catch trivial p
i
lot errors
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-11
Junio C
H
amano
t330
0
:
funn
y
n
am
e
test
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-10
J
u
nio C
H
ama
n
o
Li
n
k Everyday GIT to main documentation tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-10
Junio C
H
amano
E
v
e
r
y
day G
I
T with 20 c
o
mmand
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-10
Junio C
H
a
m
ano
Use
G
IT_EXEC_PATH explici
t
ly f
o
r
i
nit
i
al git
-
i
n
it-db
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
Junio C Hamano
g
i
t-prune: never lose obje
c
ts reachable from our refs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
Junio
C
Hamano
qsor
t
(): ptrdiff_t may be larger than
in
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-09
Junio C Ha
m
ano
Docume
n
tatio
n
:
git-prune
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
J
unio C Haman
o
sho
w
-branch: comment typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
Documentation: recur
s
ive is the default
s
trategy these
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Jun
i
o
C
Hamano
M
ake sure we use compat/subprocess
.
py wit
h
Python 2
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C H
a
m
a
no
refs
.
c:
m
ake sure leadin
g
dir
e
ct
o
r
ies exist be
f
or
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
J
u
nio C Hamano
Do
c
um
e
n
t
at
i
on(tuto
r
ial):
adjust merge ex
a
mp
l
e
t
o the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hama
n
o
Documentation(c
v
s-migration): minor
c
l
e
a
nups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Jun
i
o C H
a
m
a
no
Documen
t
ati
o
n
(
glo
s
sary): minor fo
r
matting clean-ups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C
H
amano
D
oc
u
mentatio
n
: git
.
h
t
ml/git
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Ha
m
ano
Merge
h
ttp://www
.
k
e
rnel
.
o
rg/pu
b
/
s
c
m
/
gi
t
k
/
gitk
commit
|
commitdiff
|
tree
2005-12-07
J
u
nio C Hamano
update-in
d
e
x
: allow --i
n
dex-info to add higher stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
git-merge-on
e
: new
m
erg
e
wo
r
ld order
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
checkout-inde
x
:
a
ll
o
w checkin
g
out from higher stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Jun
i
o C Hamano
qsort
(
)
ptrdiff_
t
may
b
e larger t
h
an int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Juni
o
C H
a
ma
n
o
git
-
merge
-
one-file: resurre
c
t lead
i
ng path creatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
Docu
m
ent
a
iton (r
e
ad-tr
e
e):
u
pdate d
e
script
i
o
n of 3-way
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Jun
i
o C Ham
a
no
Documentat
i
o
n: hash-object
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Jun
i
o C Hamano
write-
t
ree: check extr
a
arg
u
ments
and
d
ie but
be a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C
Ha
m
ano
init-db
:
check
e
xt
r
a arg
u
ments and co
m
plain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C
Ha
m
a
n
o
h
a
sh-ob
j
ect: -- and --help
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
g
it-mv to work w
i
th Perl 5
.
6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
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 Hama
n
o
C
lean up compatibility d
e
fi
n
ition
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
config
.
c: remov
e
unnecessar
y
h
e
ader in m
i
n
im
u
m config
u
r
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
server
-
info
.
c: and two fu
n
c
tions are not used
a
n
ymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Haman
o
server-info
.
c
:
use p
a
ck_local like everybody else
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
n
io C Hamano
Documentation: s
h
ared
reposito
r
y management in
tuto
r
ial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Hamano
Documentation: pus
h
/receive
hook r
e
ferences
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documentation: git-diff
ascii
d
o
c table workar
o
un
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hamano
Documentation: git-mv m
a
n
page
w
orkaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio
C H
a
man
o
Documentation: tal
k
about pathspec in bise
c
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o C Hamano
server-info: throw away T
comp
u
tati
o
n as
w
el
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C H
a
man
o
s
erver-in
f
o: stop sortin
g
pack
s
b
y
latest date
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Ham
a
n
o
s
e
rve
r
-info
.
c: drop unused D lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C Hamano
sha1_file
.
c:
make sure p
a
cks in an a
l
tern
a
te odb is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C Hamano
git
.
c:
r
emo
v
e excess
output for debugging when command
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
struct tree: remove unused
f
iel
d
"parent
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C Hamano
D
ocument
a
t
ion:
reba
s
e does not
use cherry-pick an
y
m
o
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Haman
o
show-
b
ra
n
ch: allow glob
p
a
ttern to name branches to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Hama
n
o
g
i
t
.
c: two f
i
xes, gitsetenv type and off-by
-
one error
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio
C
Hamano
compat/
s
e
te
n
v:
do
n
ot free wh
a
t
we fed pute
n
v
(3)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Haman
o
[
P
ATCH]
d
a
em
o
n
.
c and path
.
enter_repo(): revamp path
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
documentation
:
git-bi
s
ec
t
(help HTML
b
r
e
ak man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C Hamano
git-merge document
a
tion:
conflicti
n
g m
e
r
ge lea
v
es higher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
a
mano
m
e
rge-
o
ne-file: mak
e
sure
w
e do not mismer
g
e sy
m
bolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Ha
m
ano
merge-one-f
i
le: make sure we
c
r
eate the merged file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
t3
1
00: add ls-tree -t and -d te
s
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
merge-recur
s
i
v
e
: adjust git-
l
s-tree u
s
e for the lates
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C Hamano
git-merge-
o
ne-file: do not worry
about
'
rmdir -p' not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
C Hamano
ls-tre
e
:
-
-
n
a
me-
o
n
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hama
n
o
ls
-
t
ree: resurrect '-d' to mean 'show t
r
ees only'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
unio C Hamano
Makefile: sa
y
t
he defaul
t
target
upfront
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
Docu
m
entation: describe '-f' option to
gi
t
-fe
t
ch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Hamano
Mer
g
e branch
'
jc/subdir
'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merge
br
a
n
ches 'jc/apply',
'
lt/ls
-
tree', 'lt/
b
i
s
ect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
am
a
no
Tutoria
l
: adjus
t
merge exam
p
l
e to re
c
u
rsive strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ham
a
n
o
merge-recursiv
e
:
match th
e
unme
r
ged index entry behaviou
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C
H
a
mano
dif
f
-files: show dif
f
s with stage0 an
d
unmerged stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
unio C H
a
mano
git-diff: do not turn off -
p
/-M with any diff
o
pt
i
ons
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
M
erge
http:/
/
w
ww
.
kern
e
l
.
org/pub/scm
/
g
i
t
k
/g
i
t
k
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
f
ormat-pat
c
h:
r
un diff in
C locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C H
a
mano
format-pa
t
ch: do not abuse 3-dash marker
line
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
fo
r
mat-patch: re
m
ove applies
-
to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
a
ppl
y
patc
h
: use
"
i
ndex" lines not
"
a
pp
l
ies-to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
app
l
y
mb
o
x: typofi
x
to enabl
e
-m opt
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C Hamano
hash-object
.
c: type-fix to squ
e
lch compiler warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
define die() for scripts
t
h
at u
s
e it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
ma
n
o
ve
r
ify-tag: make it oper
a
ble from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
ni
o
C Ha
m
ano
tag: m
a
ke it operable from a subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C
H
ama
n
o
lost-f
o
und: make it
operable from a su
b
di
r
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
Hamano
branc
h
: mak
e
it ope
r
abl
e
from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
ls-re
m
ote: define di
e
(
) no
w
we do not us
e
git-sh-setup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Ham
a
no
count-objec
t
s: mak
e
it oper
a
ble from a subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
Make the
r
est of com
m
ands work from a su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
M
a
ke n
e
tworking commands to work fro
m
a subdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C
H
ama
n
o
ls-tree: w
o
rk from subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o
C
H
amano
hash-object: work wit
h
i
n subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
amano
checkout
-
index: work f
r
om
sub
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
f
sck-o
b
jects: wo
r
k from su
b
direct
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
pe
e
k-remote
:
honor proxy config eve
n
from
subdire
c
to
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
g
i
t
-apply:
w
ork
f
rom subdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
i
o C Hamano
wor
k
i
ng
f
r
o
m subdirectory: preparatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
bisect: quote p
a
thnames for e
v
al safety
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
ls-tree: match the test to the new semant
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Haman
o
ls-t
r
ee: Resurrect funny name quoti
n
g lost
d
u
r
i
ng r
e
write
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
write_name_quoted():
m
ake one 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
Docum
e
ntation: Describe merge operation
a
b
i
t b
e
tter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
amano
n
a
m
e-rev: fix parent c
o
unting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Hamano
r
e
b
ase: one safety
net, one bug
f
i
x an
d
on
e
optim
i
zation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ham
a
no
Me
r
ge http
:
//www
.
ke
r
n
e
l
.
org/pub/scm/g
i
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
g
it-mv: quo
t
e $src in
regexp properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next