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
/
t6022: a new test for renami
n
g merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-11
Ju
n
i
o
C Ham
a
n
o
me
r
ge-
r
ecursive:
c
l
e
anup setIndex
S
tag
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-11
J
u
nio C Hamano
merge
-
rec
u
rsi
v
e: l
e
ave u
n
me
r
ged entries in the index
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-11
Junio C H
a
ma
n
o
format-patch:
use same numb
e
r o
f
d
igits
i
n nu
m
bers
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-11
Ju
n
io C
H
a
mano
t
0000: catch trivia
l
pi
l
ot errors
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-11
Junio C Hamano
t3300: funny name test
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-10
Junio C
H
amano
Link
E
veryday GIT to main
d
o
c
umentation tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-10
Junio C Hamano
Everyday G
I
T with
2
0 comma
n
ds
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-10
Ju
n
io C Hamano
Use GI
T
_
EXEC_P
A
T
H
explicitly for
initi
a
l git-ini
t
-db
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-09
Junio
C Ha
m
an
o
git-prune: never
lose objects reachable from our
r
e
fs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-09
Junio C Ha
m
ano
qsor
t
(): p
t
r
d
iff_t may be larger than i
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-09
J
u
n
i
o
C
Hamano
Documentation: gi
t
-
p
rune
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-08
Jun
i
o
C
Hamano
show-
b
ranch:
comment typo
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
Docu
m
en
t
ati
o
n
: rec
u
r
s
i
ve is
the defau
l
t
strategy
t
h
es
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-08
J
u
nio C
Hamano
Make s
u
re we u
s
e
c
ompat/subprocess
.
py with P
y
thon
2
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
refs
.
c
:
make sure lea
d
ing directories exi
s
t
before
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-08
Junio
C
Hamano
Docume
n
tation(tutoria
l
)
:
adju
s
t
m
e
r
g
e exa
m
ple to th
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-08
J
unio C
H
amano
D
o
cumentation(cvs-migration): minor cle
a
nups
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-08
Junio C
Ham
a
no
Do
c
u
m
entation(glossar
y
)
:
m
inor form
a
tting clean-ups
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-08
Junio
C
Hamano
Documentation: git
.
h
tml/git
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Junio
C Hamano
Merge http://www
.
kernel
.
o
r
g/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
update-index:
a
llow --index-info t
o
add higher stages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Jun
i
o C Haman
o
gi
t
-
m
erg
e
-one:
new
merge world
order
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
check
o
ut
-
in
d
ex:
a
l
l
o
w
checking 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
Junio C Hamano
g
i
t-
m
e
rge-one-file:
r
esurrect
leading path creati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
J
u
nio C Hamano
D
ocumentai
t
on (read-t
r
ee):
update descri
p
tion of 3-way
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Ham
a
no
D
ocument
a
tion: h
a
sh-object
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Haman
o
write-tree: check
extra arg
u
ments and di
e
but be a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C Hamano
init-db:
check extra argument
s
and complain
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
J
unio C Haman
o
hash-o
b
ject: -- and --
h
elp
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hama
n
o
Clean up
c
ompatibili
t
y definiti
o
n
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C Hamano
conf
i
g
.
c: remove unnecessary
h
eader in min
i
mum
confi
g
uration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o
C Ha
m
ano
s
e
r
v
e
r-info
.
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
-
in
f
o
.
c: us
e
pack_lo
c
al li
k
e
everybody
e
lse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documentat
i
o
n
: shared r
e
pository managem
e
nt in tutorial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
D
o
cumen
t
ation
:
push/receive
hook referenc
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Ham
a
no
Documen
t
ation: git-
d
i
f
f
asciidoc table wo
r
karound
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C Hama
n
o
Docum
e
ntation: git-mv manp
a
ge wor
k
around
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hamano
Documentat
i
on: ta
l
k ab
o
ut
pathspec in bisect
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
ama
n
o
ser
v
er-i
n
fo:
throw away T c
o
mpu
t
a
t
ion as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
amano
s
er
v
e
r
-info: s
t
op sorting
pac
k
s by latest date
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
server-info
.
c:
drop unused
D li
n
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Haman
o
sha1_file
.
c
:
m
a
ke sure packs in
a
n
a
l
t
ernate
o
d
b
is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
un
i
o C Hamano
git
.
c: rem
o
ve exce
s
s
outpu
t
for debugging when c
o
mmand
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
H
ama
n
o
struc
t
tree: remove
u
n
u
s
ed f
i
e
l
d "parent
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documentation: rebase does not us
e
cherr
y
-
pick anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io C
H
a
mano
show-bran
c
h
:
allow glob pattern to name b
r
anches to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Hamano
g
i
t
.
c: t
w
o fixes, gitsetenv type and
of
f
-by-one
erro
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Junio C
H
a
m
ano
compat/setenv: do not free what we fed p
u
tenv(3)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Ham
a
n
o
[PAT
C
H] daemon
.
c a
n
d path
.
e
n
ter_repo
(
): reva
m
p path
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Jun
i
o
C
Hamano
documentation: gi
t
-
b
i
sect (help HTML
br
e
ak
m
an)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
ni
o
C Hamano
git-merg
e
documentation: conflictin
g
merge leaves
higher
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hama
n
o
me
r
g
e
-one-file
:
make
s
ure we do no
t
m
i
sm
e
r
g
e symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hama
n
o
merge-o
n
e-file: make
s
ure we create th
e
mer
g
ed file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hama
n
o
t3100:
a
dd ls-
t
r
e
e -t and -d tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C
H
amano
m
erge-recur
s
i
ve:
a
djust gi
t
-ls-tree
u
se fo
r
the
late
s
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C Hamano
git
-
merge-
o
ne-file: do not
w
orry abou
t
'rmdir -p'
n
ot
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
H
a
mano
ls-t
r
e
e
: --name
-
only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio
C Haman
o
l
s
-t
r
ee
:
resurrect '-d' to mean 'sh
o
w trees only
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Haman
o
Ma
k
efile: say the default target upfront
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hama
n
o
Documentation: describe
'
-f'
option to git-fetc
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
unio C Hamano
Merge bra
n
ch 'j
c
/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Merge branches 'jc/app
l
y', 'lt
/
l
s-tre
e
', 'lt/bisec
t
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Junio C H
a
mano
Tutoria
l
:
a
dj
u
st merge e
x
a
mple to recurs
i
ve strat
e
gy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
me
r
g
e
-re
c
ursive:
m
atch the unmerg
e
d index entry b
e
h
av
i
ou
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ham
a
no
d
i
f
f-file
s
: sh
o
w diffs with stage0 and unmerged stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
J
u
ni
o
C
Hamano
git-diff: do not t
u
rn off -p/-M with any diff options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
Merge http://www
.
kernel
.
org/pub
/
s
c
m/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C Hamano
f
o
rm
a
t
-
p
a
t
c
h: run d
i
f
f i
n
C locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format-patch: do not abuse 3-dash marker line
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C Haman
o
format-patch: remove a
p
p
l
ies-to
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
applypatch: use "index" li
n
es not "
a
p
pli
e
s-to"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ap
p
lymbox
:
t
y
pofix t
o
enable -m option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
hash-object
.
c: type-fix to squelch
c
ompiler w
a
r
nings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
define
die() f
o
r scrip
t
s t
h
at use it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
verify-ta
g
: ma
k
e it operable
f
ro
m
a subd
i
r
e
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
tag: make it oper
a
ble from a subdirector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ha
m
ano
l
o
st-found: make it op
e
rable fr
o
m a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
branch: make it operable fr
o
m a subdir
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hama
n
o
ls-
r
emote: define d
i
e() now we do not u
s
e git-sh-
s
etup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hama
n
o
count-objects:
make i
t
operable from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
Make the rest of
commands work from a s
u
bd
i
rect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Make n
e
tworkin
g
co
m
ma
n
d
s
to
w
ork
f
rom
a
subdi
r
ectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
ls-tree:
work from sub
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
hash-object: work wi
t
hin s
u
bdirect
o
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Ha
m
a
n
o
c
heckout-
i
ndex: work from subd
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
fsck-objec
t
s: work from
subdi
r
ec
t
or
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
peek-rem
o
te: honor 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
Junio C Hamano
git-app
l
y: work from
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
working f
r
om subdirectory: prepa
r
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
b
isect: quote pathn
a
mes for e
v
al safety
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
l
s
-tree:
m
atch the test to the ne
w
semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
mano
l
s
-tree:
R
e
surrec
t
f
unny na
m
e
quoting
lost during r
e
write
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C
H
a
m
an
o
write_na
m
e_quoted():
m
ake
o
n
e
o
f the pat
h
a co
u
nte
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
Documenta
t
ion: Describe merge operation
a
b
it better
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
na
m
e-rev: fix pa
r
ent count
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Ha
m
ano
rebase: one safety net, one bugfi
x
and
one optimization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-28
J
unio C Hamano
Merge ht
t
p://www
.
kernel
.
o
r
g/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-28
Junio C H
a
mano
git-m
v
: quot
e
$s
r
c in
r
e
gexp properly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next