repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-merge-one-file: resurrect leading path creation.
2005-12-06
Junio
C
Hamano
g
i
t
-merge-one-
f
i
le: resurrect
l
eading pat
h
crea
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io C
H
amano
Docume
n
taiton (re
a
d-tre
e
): upd
a
t
e
descri
p
t
ion of 3-way
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
Documenta
t
ion: ha
s
h-ob
j
e
ct
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
w
rite-tree: ch
e
ck extra
a
r
g
ume
n
ts an
d
d
ie but be a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Juni
o
C Ham
a
no
init-db
:
check extra arguments
a
n
d
com
p
lain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Ju
n
io
C
Hamano
ha
s
h-object:
-- a
n
d
-
-help
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
o
n Loeli
g
e
r
Added
d
o
cumentation
f
or few m
i
ssing options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C
H
a
mano
g
i
t
-
mv to
wo
r
k with Perl
5
.
6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C Hamano
Fix 5
5
01 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
Ju
n
io
C Hamano
C
l
ean up compatib
i
l
i
ty defi
n
itions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
a
s
on
R
iedy
[PATCH] Document config
.
m
a
k in INS
T
ALL
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
co
n
fig
.
c:
r
e
m
ove unnecessary
h
eade
r
in min
i
m
um configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o C Haman
o
ser
v
er-
i
nfo
.
c: and
t
w
o
functions ar
e
not u
s
ed anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
amano
s
e
rver-info
.
c: use pack_
l
ocal
like everybody el
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
D
o
cumentation: shared repos
i
tory
m
anagement
i
n
tutorial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io
C Hamano
Documentatio
n
:
push
/
re
c
e
ive hook references
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C H
a
m
a
n
o
Do
c
umentat
i
o
n
: git-diff asciidoc table wo
r
ka
r
ound
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
Hamano
D
o
c
u
mentatio
n
:
git-mv man
p
age w
o
rkar
o
und
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
unio C Haman
o
Document
a
tion: talk about pathspec in bisect
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Hamano
server-info: throw
a
way T c
o
mpu
t
atio
n
as wel
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
amano
server-inf
o
: stop sorting
p
a
cks by latest dat
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
s
e
rv
e
r-inf
o
.
c: drop unused D lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
sha
1
_fil
e
.
c: make sure
p
ac
k
s
i
n
an al
t
ernate odb is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io
C
Hamano
git
.
c: remove
exc
e
ss outp
u
t for deb
u
g
g
ing
when command
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
struct tree: remove unused
fie
l
d
"parent"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Doc
u
ment
a
t
i
on: rebase do
e
s not use
cherry-
p
ick any
m
ore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
P
e
tr Baudis
Document t
h
e
--(no-)
e
dit switch o
f
g
i
t-re
v
e
r
t and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
sho
w
-branch:
allow g
l
ob pattern to name branc
h
es t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Petr Baudis
Update the git-ls-tree docu
m
entation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Jun
i
o C
H
amano
git
.
c: two fixes, gitsetenv type an
d
off-b
y
-one error
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C
H
a
m
ano
compat/setenv: do n
o
t f
r
ee wh
a
t we
fed putenv(3)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Daniel Barkalow
W
a
rn when
s
e
nd-pac
k
d
oes nothing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C Ham
a
no
[PATCH] daemon
.
c
a
nd path
.
enter_
r
e
po(): revamp path
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
H
.
Peter Anvin
A few more op
t
ions for gi
t
-
cat-file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Ja
s
o
n R
i
edy
Add com
p
at/se
t
env
.
c, use in git
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
F
r
ed
r
ik Kuivinen
Ne
w
test case: Criss-cr
o
ss merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivine
n
N
ew tes
t
case: m
e
rge with
d
irectory/file
c
o
n
flicts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuivinen
t
e
st
-
l
ib
.
sh
:
Add
n
ew function, test_expect_code
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Kuivinen
git-merge: Exit with
co
d
e
2 if no strategy was able
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No name
documentatio
n
: git-tag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C Hamano
documentation: git-bisec
t
(help HTML break man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No name
doc
u
mentation: clari
f
y read-tr
e
e --
r
eset
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Haman
o
git-
m
e
r
ge documentation: con
f
l
i
cting merge le
a
ve
s
h
ig
h
er
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
a
mano
m
e
rge-on
e
-file: make sure we
d
o
not mismerge sym
b
olic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
m
e
rge-o
n
e-file
:
make s
u
re we create the m
e
rged
file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
nio C
H
amano
t3100:
a
d
d ls-tree -t and -d tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C H
a
mano
merge-recursi
v
e: adjust git-ls
-
tree
u
se
fo
r
the latest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Alex Riesen
g
i
t wra
p
per:
m
o
re careful
argument st
u
ffing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C H
a
m
a
n
o
git-
m
erg
e
-one-
f
ile: d
o
not wor
r
y
abou
t
'rmd
i
r -p' n
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C
H
am
a
n
o
ls-tree
:
-
-
name-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
ls
-
tr
e
e: r
e
surrect '-d' to mea
n
'show trees only'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Linus Torvald
s
g
i
t-ls-tree:
add "-t" option to always
sh
o
w the
t
ree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C
Hamano
Ma
k
efile: say the default
t
a
r
get upfront
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
Hamano
Documentation: describe '-f' option to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
T
i
m
o H
i
rvonen
Move
coupl
e
o
f
i
fdefs after
"inc
l
ude conf
i
g
.
mk"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C Ha
m
an
o
Merge br
a
nch 'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io
C
H
a
mano
M
e
r
ge branch
e
s
'
jc/ap
p
l
y'
,
'lt/ls-t
r
ee', 'lt/bisect
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
T
ommi Virtanen
Do
n
ot attempt to
a
ccess l
i
t
eral dirname "GIT_OBJECT_D
I
RECTORY"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C Hamano
Tutorial: adjust m
e
rge example to recursive str
a
tegy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
J
unio
C
Ha
m
ano
merge-r
e
cursi
v
e: match the unmerged in
d
ex entry be
h
aviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C
Hama
n
o
diff-fi
l
es: show diffs wi
t
h stage0 and un
m
e
r
ged
s
tage
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus Torvalds
merge-one-file: leave unmerge
d
i
n
d
ex
e
ntries upon automerge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Linus To
r
valds
dif
f
-files:
-
1/-2
/
-3 to
diff agains
t
un
m
e
rged st
a
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
git-dif
f
: do not turn
o
f
f -p/-M with any diff o
p
tions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Ham
a
no
Merge http://www
.
ker
n
el
.
org/p
u
b
/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-29
A
lex Riesen
[PATCH] Add test
s
for git-mv in
s
u
bdirec
t
ori
e
s
Junio C Hamano
, Sat, Nov 26, 2005 03:45:52 +0100:
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Johannes S
c
h
i
ndeli
n
[
PA
T
CH] M
a
k
e git-mv wo
r
k in subdirect
o
ries, too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Hama
n
o
format
-
pa
t
ch: run diff in C locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
format
-
patch: do not abu
s
e 3-dash marker lin
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C
Ha
m
ano
forma
t
-patch: remove applies-to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
an
o
applypa
t
ch: use "in
d
ex" lines n
o
t "applies-to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
a
mano
app
l
ymbox: typofix to
e
n
a
ble
-
m option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Matthia
s
Urlichs
SVN import:
Use one log call
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
jdl@
f
r
eescale
.
c
om
Fix typos an
d
minor f
o
r
mat
i
s
s
ues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Nick Henge
v
eld
h
ttp
-
p
u
s
h
cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
P
a
vel Roski
n
g
i
t-clon
e
-
-
shared should im
p
ly --loc
a
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Ha
m
ano
hash-object
.
c: type-fix to squ
e
lch
compile
r
warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Ha
m
an
o
define die() for scripts that use it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
verify-tag
:
make it operable f
r
om
a
s
ubdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
tag: ma
k
e it operable
f
r
o
m a subdi
r
ec
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C
Hamano
l
o
s
t
-
found:
m
a
ke it operable from a
sub
d
i
r
e
c
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Ha
m
ano
b
ran
c
h:
make it operable f
r
om a subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C H
a
m
ano
ls-remote: defin
e
die
(
) now we do not
u
s
e git
-
sh-setup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
c
o
u
n
t
-objects: mak
e
it op
e
rable from a sub
d
ire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Make the rest
of commands work from a subdire
c
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Ham
a
no
M
a
ke ne
t
working
c
o
m
m
ands t
o
wo
r
k from a su
b
direct
o
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Hamano
ls-tree: w
o
rk from
s
ubdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
io C Hamano
hash-object: wo
r
k within subd
i
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
checko
u
t
-i
n
dex: work f
r
om subdir
e
c
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ham
a
no
fsck
-
objects: work from subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
peek-remote:
h
o
n
o
r
proxy config eve
n
from subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
git-appl
y
: work from subdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C H
a
m
a
no
workin
g
f
ro
m
s
u
b
d
i
rect
o
ry: preparati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Ham
a
no
bis
e
ct:
q
u
o
t
e pat
h
names
f
or eval safe
t
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus Tor
v
a
lds
bisect
:
limit the searchsp
a
ce by
p
a
ths
p
ecs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
n
i
o C Hamano
ls-tree:
ma
t
ch the te
s
t to the new sema
n
t
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C Ha
m
a
n
o
ls-t
r
ee: Resurre
c
t funny name qu
o
ting lost during rew
r
ite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Linus Torvalds
ls-tree: furthe
r
tweaks of the
rew
r
i
t
e
commit
|
commitdiff
|
tree
2005-11-29
L
i
nus Torvalds
l
s
-t
r
ee
:
furt
h
er cle
a
nup to
p
a
ralle
l
ls-files
.
commit
|
commitdiff
|
tree
2005-11-29
Linu
s
T
orvalds
l
s-tree: major r
e
write to do path
s
pec
commit
|
commitdiff
|
tree
next