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
Junio C Hamano
Merge http:
/
/
www
.
ker
n
el
.
org/pu
b
/scm/git
k
/
gitk
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
u
pd
a
te
-
index: al
l
ow
-
-index-info to add higher stages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Junio C
H
amano
git-merge-one: n
e
w
merge world o
r
der
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Juni
o
C Hamano
checkout
-
in
d
e
x
: allow
c
hecking o
u
t fro
m
higher stages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Jaso
n
Ri
e
d
y
Us
e
print
f
rather th
a
n echo -n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Junio C
Hamano
qsort(
)
ptrdiff_t may be larger than int
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-07
Jas
o
n Riedy
[PATCH] Initial AIX
p
ortab
i
lity fixes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Jun
i
o C Ha
m
an
o
git-m
e
r
g
e
-
on
e
-f
i
le: resurrect leading path c
r
e
a
ti
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C
Hamano
Documen
t
ai
t
on (read-t
r
ee): update description of 3-wa
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C Hamano
D
ocumentat
i
on: hash
-
o
b
j
ect
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Juni
o
C H
a
man
o
write-tree:
ch
e
ck extra arguments and die
b
ut
b
e a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Ham
a
no
i
nit-db: check extr
a
arguments an
d
c
o
mplain
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io
C Ha
m
ano
hash-o
b
ject: -- and --
h
el
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Jon Loeli
g
er
Added d
o
cumentation for f
e
w missing options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hama
n
o
git-mv to w
o
rk with 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@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C H
a
mano
Clean up compat
i
b
ility d
e
finiti
o
n
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
a
s
o
n Riedy
[PATCH]
Docume
n
t
config
.
mak i
n
INSTAL
L
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
unio C
Hamano
config
.
c: remove unnece
s
sary header i
n
mini
m
um
configura
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Haman
o
serv
e
r-info
.
c: and 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-info
.
c: use pack
_
local lik
e
everybody else
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io
C
H
a
mano
Doc
u
mentation: shared re
p
osi
t
ory managem
e
n
t
i
n tutorial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
i
o C Hamano
Documentation:
p
us
h
/receive hook references
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C Hamano
Documentation:
git-diff asciidoc table workaround
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o C
Hamano
Document
a
tio
n
:
git-mv manpage worka
r
ound
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ham
a
n
o
D
ocum
e
ntation: talk about pathspec in bis
e
ct
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C H
a
mano
server-info: throw away T computation
a
s
w
ell
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hama
n
o
server-inf
o
: stop sorting packs by
latest
date
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C Hamano
server
-
info
.
c: drop unu
s
ed
D
l
ine
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ham
a
no
sh
a
1
_
file
.
c:
make sure packs in an
alternate 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
cess o
u
tput for debugging
when command
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
struc
t
tree: re
m
ove unused field
"parent"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
Documentation: rebase does not use cherry-
p
ick an
y
mor
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Petr
B
audi
s
Document the
-
-(n
o
-
)edit
switch of g
i
t-reve
r
t and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio
C
Hamano
show-branch: allow gl
o
b
patt
e
rn to
n
a
m
e
b
ran
c
hes to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-05
Petr Baudis
Update the git-ls
-
tree d
o
cumen
t
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Hamano
g
i
t
.
c: tw
o
fix
e
s
, gits
e
tenv type
a
nd off-by-one
err
o
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Hamano
c
o
mpat/setenv: do n
o
t free what we fed putenv(3)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Daniel Barkalow
Warn wh
e
n send-pack do
e
s
n
othin
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Hamano
[PATCH] daemon
.
c and p
a
th
.
e
nter_repo(): r
e
vamp pa
t
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
H
.
Peter
An
v
i
n
A
few
m
ore option
s
f
o
r git-cat-
f
ile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-04
Jason Riedy
Add compat/setenv
.
c, u
s
e i
n
git
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivinen
New test case: Criss-c
r
oss merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
Ne
w
test case:
m
e
rge with dire
c
tory/fi
l
e
con
f
licts
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
t
e
st-lib
.
sh:
Add
new fun
c
tion, test_expect_
c
o
de
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivine
n
g
it-
m
e
rge: Ex
i
t with c
o
de 2
if
no strategy was able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
docum
e
nta
t
ion: g
i
t-tag
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
amano
docum
e
ntation: git-bisect (hel
p
HTML br
e
a
k
man)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
No name
documentation: clarify
read-tree
-
-reset
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
n
io
C Hamano
git-merge
docu
m
entation:
c
o
n
flicting
m
erge leaves h
i
gher
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Ha
m
ano
merge-one-file: make s
u
re we do
n
o
t misme
r
ge symbolic
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
unio
C
H
amano
merge-one-fil
e
:
mak
e
sure
w
e
c
re
a
t
e
the
merged file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C
Ham
a
no
t3100:
a
dd ls-tree
-
t
an
d
-d tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io C Hamano
m
erge-recursive: adjust git-ls-
t
ree us
e
f
o
r the lat
e
s
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
Alex
R
i
e
s
e
n
g
i
t wra
p
per: more
c
a
reful argument stuffing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C Haman
o
git
-
merge-one-file: do
not
worry about
'
rm
d
ir -p' not
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls-tree: --n
a
me-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hama
n
o
ls-tree: resurrect '-d' to mean 'show
trees only
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Linus Torva
l
ds
git-ls-tree: add
"
-t" o
p
tion to alwa
y
s show the tre
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Junio C H
a
mano
Makefile: sa
y
the default target upfr
o
nt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Jun
i
o
C Hamano
Documentation
:
d
e
scribe
'-f'
option to git-fet
c
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-12-01
Timo
H
irvonen
Move couple of i
f
defs after "includ
e
confi
g
.
mk"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
Hama
n
o
M
e
rge branch 'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Junio C Ham
a
no
Merge branches 'jc/
a
ppl
y
', 'lt/ls-t
r
ee', 'lt/bis
e
ct
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
T
o
mmi Virtanen
D
o
n
ot attempt to access li
t
e
r
al dirname "GIT_OBJECT_DIRECT
O
RY"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
i
o
C
Hamano
T
uto
r
ial: adj
u
st me
r
ge example to
recursive strategy
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o
C
Hamano
merge-rec
u
rsive: match t
h
e unmerged index
e
ntry behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Hamano
diff-fil
e
s: show diff
s
w
ith
stag
e
0 and unmerged
stage
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Linu
s
Tor
v
ald
s
merge-one-file
:
leave
u
nmerg
e
d index entries upon automerge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Li
n
u
s Torvalds
diff-fi
l
es: -1/-2/-3
t
o diff agains
t
u
n
m
er
g
ed stage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
git-
d
i
ff:
d
o not
turn off -p
/
-M wi
t
h any d
i
ff options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Mer
g
e
http://www
.
ke
r
nel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex Riesen
[PATCH] Add t
e
sts for git-mv
i
n subdirectories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Johannes Schindelin
[PATCH
]
Make git-
m
v
w
o
r
k
in subdirector
i
es, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
format-patch: run diff in C
locale
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
m
ano
format-patch: do n
o
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
H
amano
format-patch: remo
v
e appl
i
es-
t
o
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
appl
y
patch: use "index" lines
not "appli
e
s-to"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
appl
y
mbo
x
:
t
ypofix
to enable
-m option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Mat
t
hias
U
rlichs
SVN import
:
Use
one log call
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
jdl@freesc
a
le
.
com
Fix
typos
and minor format issues
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Nick Hen
g
eveld
h
ttp-push cleanup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Pavel Roskin
git-
c
l
one --s
h
ared sho
u
ld imply --
l
ocal
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Ha
m
ano
h
a
sh-obj
e
ct
.
c: t
y
pe-f
i
x to squ
e
lch
compiler warnings
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
define
d
i
e
() for
script
s
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
Jun
i
o C Hamano
tag: make it operable f
r
o
m a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
Ha
m
ano
lost-found: make it o
p
e
r
abl
e
from
a
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
branch: make it operable from a su
b
d
irectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
l
s
-r
e
mot
e
:
d
efin
e
d
i
e() no
w
we do no
t
use git
-
sh-
s
et
u
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
count-
o
bj
e
cts: make it
o
pe
r
able
f
rom
a
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hama
n
o
M
a
k
e
th
e
rest of commands wo
r
k from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
M
ake networking commands to work from a subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
ls-tree: work from subdir
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
ha
s
h-o
b
ject: w
o
rk
w
ithin su
b
d
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
checkout-index
:
w
o
rk fr
o
m subdir
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
J
un
i
o C Ha
m
ano
fsck
-
objec
t
s: work from subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Haman
o
pee
k
-r
e
mo
t
e
: hon
o
r proxy confi
g
eve
n
fro
m
su
b
director
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
git-apply: work
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 Ham
a
no
working from subdirectory: pr
e
pa
r
a
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next