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 http://www.kernel.org/pub/scm/gitk/gitk
2005-12-07
J
un
i
o
C Haman
o
Merge
h
ttp://www
.
ke
r
n
e
l
.
org
/
pub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2005-12-07
Juni
o
C H
a
m
ano
upd
a
t
e
-index:
al
l
ow --index-info to add high
e
r
stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
git-me
r
ge-one: new merge world
o
rder
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
checko
u
t-index: al
l
ow check
i
ng out from higher stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio
C
Ham
a
no
qsort
(
) ptrdiff_
t
may
b
e larger than int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C Hamano
git-mer
g
e-one-file: resurrec
t
lead
i
ng path creation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio C
H
amano
Docum
e
n
t
aiton (r
e
ad-tr
e
e
): update descr
i
ption of 3-way
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
unio C
Hamano
Documentation:
h
ash-object
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
unio
C H
a
mano
write-tree:
c
heck ext
r
a argum
e
nts
and d
i
e but be
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Jun
i
o C Hamano
i
n
it-
d
b: check
extr
a
a
r
guments and complain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
unio C
H
amano
hash-object: -- and --help
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C H
a
mano
git-m
v
to wor
k
with
P
erl 5
.
6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Haman
o
Fix 55
0
1 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 H
a
mano
Clean up com
p
at
i
bility definitions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
unio
C Hamano
con
f
ig
.
c: remove unnecessa
r
y
heade
r
in
m
inimu
m
c
o
nfigura
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
unio C Hamano
serv
e
r-
i
nfo
.
c
: a
n
d two functions are not used anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
server-
i
nfo
.
c: use pack
_
loc
a
l
like eve
r
ybody else
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
D
oc
u
mentation
:
share
d
reposito
r
y managem
e
nt in t
u
tor
i
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
D
ocumentation: push/rece
i
ve hook refere
n
ces
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documentat
i
on: git-diff
a
s
c
i
idoc table workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
amano
Documenta
t
ion: git-mv manpag
e
workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hama
n
o
Doc
u
mentatio
n
: talk about pathspec i
n
b
i
se
c
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io C
Haman
o
s
e
rver-info: throw
a
way T co
m
p
utation as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
amano
serve
r
-info: sto
p
so
r
ting packs by latest d
a
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ham
a
no
server-in
f
o
.
c: d
r
o
p unused D l
i
nes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
unio C Hama
n
o
s
ha1_file
.
c: m
a
ke sure pack
s
in an al
t
ernate
o
d
b is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hamano
git
.
c: remove ex
c
es
s
output fo
r
debugging wh
e
n command
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io C Haman
o
str
u
c
t tree: remove unused field "parent"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
n
io C Ha
m
a
no
Document
a
tion: rebase does no
t
use cherry-p
i
ck
anymo
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Ha
m
ano
show-
b
ranch: a
l
low glob patt
e
rn
t
o n
a
me
b
ranches to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
J
unio C Hamano
git
.
c:
t
w
o fixes, gitsetenv type and off-by-one error
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C H
a
mano
com
p
at/setenv: d
o
not free what we fed putenv
(
3)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Hamano
[PAT
C
H
]
daem
o
n
.
c
and pa
t
h
.
enter_repo(): r
e
vamp p
a
th
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C H
a
m
ano
docume
n
tation: git-bi
s
ect
(help HTML break man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
n
io C H
a
mano
gi
t
-mer
g
e documenta
t
ion: co
n
flicting merge leaves
higher
.
.
.
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 do not mismerg
e
symbolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
me
r
ge
-
one-file: make sure we create the merged f
i
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
unio C Hamano
t310
0
: add ls-tree -t and -d tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
Hamano
merge-recursive: ad
j
ust g
i
t
-ls-tre
e
use for the latest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C
H
amano
g
i
t-mer
g
e-one-f
i
le: do not worry abou
t
'rmdir
-
p' n
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio C Hamano
ls-tree: --n
a
me-on
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio
C
H
amano
ls-tree:
resurrect '-d' to mean 'show trees onl
y
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
C Hamano
Makefile:
s
ay
the def
a
ult target u
p
front
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
C
Hamano
Documentation: describe '-f' option to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Haman
o
M
e
rge
branch
'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hama
n
o
Me
r
ge branche
s
'jc/apply', 'lt/
l
s-tr
e
e',
'lt/bis
e
c
t
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tut
o
r
i
al: adjust merge examp
l
e t
o
recurs
i
ve
s
tr
a
tegy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
H
amano
merge
-
recursive
:
ma
t
ch the unme
r
ge
d
i
n
d
ex entry
b
e
h
aviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
Ham
a
no
di
f
f
-fi
l
es: sh
o
w
d
if
f
s with st
a
ge0 an
d
unmerged stage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
i
o
C
H
amano
git-d
i
ff: do not
t
urn off
-
p
/
-
M
wi
t
h any d
i
f
f
options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
M
e
rge htt
p
://www
.
kernel
.
org/pub/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format-patch: run dif
f
i
n C locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
format-patch: do
no
t
abuse 3-da
s
h
m
a
rker lin
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format-
p
atch: remove appl
i
es-to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
apply
p
at
c
h: use
"
index" lin
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
applymbox: typ
o
fix to enable -m
option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
hash-obje
c
t
.
c: t
y
pe-fix to squelch compiler warning
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
Hamano
d
efin
e
d
i
e(
)
for scripts
that u
s
e i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
verify-tag: make it oper
a
bl
e
from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
tag: make
it operabl
e
from a su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
lo
s
t-found: make it operable from a
s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
b
r
anch: make
i
t operable from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
ls-remo
t
e: defi
n
e die() now
w
e d
o
not use git
-
sh-setup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
ni
o
C
H
am
a
no
coun
t
-objects: make it operable
f
rom a subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
un
i
o
C
Haman
o
Make
t
h
e
r
es
t
of c
o
mmands work from a subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
Make networking
command
s
to work from
a s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
l
s
-
t
ree: work f
r
om subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
h
a
sh-o
b
ject: work
w
i
thin subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
H
aman
o
ch
e
ckout-index: work from subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
f
s
ck-obj
e
cts: wo
r
k from subdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
pe
e
k-remote: honor
p
roxy config even fr
o
m subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hamano
g
i
t-
a
pply:
work from su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Haman
o
working
f
rom
s
ubdir
e
ct
o
ry: preparation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
bisect: qu
o
te pa
t
hnam
e
s for
eval safety
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
amano
ls-tree: match the test
t
o
the
new semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
ls-tree: Resurrect funny name quoting lost during rewrite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
write_na
m
e_quoted(): make
one of th
e
path
a co
u
n
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
D
o
cume
n
tation
:
Describe
m
erge op
e
ration
a b
i
t better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Ha
m
ano
name-rev: fix parent counting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C Hamano
reb
a
se: one
safe
t
y n
e
t, o
n
e
b
u
gfix and one opti
m
ization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
unio
C Hamano
Merg
e
http://www
.
k
ernel
.
o
rg/p
u
b
/
s
c
m
/
gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
g
i
t-mv:
quo
t
e
$src in regexp
p
roperly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
[P
A
TCH] gitk
:
Use i18n
.
commitencoding configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io C Hamano
config
.
c: cons
t
ness ti
g
htening to
a
voi
d
co
m
p
i
lation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hama
n
o
m
aili
n
fo: Do not us
e
-u
=
<encoding>
;
sa
y
--
e
nc
o
ding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
m
a
ili
n
f
o: Use i18n
.
com
m
itencoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C
H
aman
o
m
a
ilinfo: al
l
ow
-u to f
a
ll back on latin1 to utf8 convers
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
u
nio
C
H
a
m
ano
Introduce i18
n
.
commitencoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Merge http://www
.
kernel
.
org
/
pub
/
sc
m
/
gitk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
setup_git_direc
t
ory():
c
heck rep
o
sitory form
a
t version
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio C
H
ama
n
o
init-db: c
h
ec
k
t
emplate and repository format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C
Ha
m
ano
Check
r
epository format ve
r
sion in enter_repo()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
Repository f
o
rm
a
t version check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
format-patc
h
: output filename rep
o
rted t
o
stdout verb
a
tim
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
u
nio C Hamano
name-
r
ev:
fix off-by-one error in --stdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio C Hamano
she
l
l
.
c:
comp
l
ain on in
s
uff
i
ci
e
n
t
argume
n
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C
Hamano
git-
s
h-setup: move
the re
p
o
sitory check
t
o
a
core program
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
nio C Ha
m
ano
set
u
p_git_dir
e
ctor
y
: make sure G
I
T_DIR
i
s a
v
alid repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-var: make it work in
s
u
b
dire
c
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
git-s
h
-s
e
t
up: die if out
s
ide g
i
t r
e
pository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next