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
Make sure we use compat/subprocess.py with Python 2.3 while running tests.
2005-12-08
Juni
o
C Hamano
Make sure we use c
o
mpat/su
b
p
r
oces
s
.
py with Python 2
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Daniel Barkal
o
w
Clean
u
p file descriptors when calling ho
o
k
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
J
u
nio C Hamano
r
e
f
s
.
c: make s
u
re leading
directories exist before
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Hamano
D
o
cumentation(tutorial): ad
j
us
t
merge example to
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Ju
n
io
C
Hamano
Documentation(cv
s
-migrati
o
n)
:
m
i
nor clean
u
ps
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio
C
Hama
n
o
Documentati
o
n(
g
lossary): mi
n
o
r formatting clean-ups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-08
Junio C Ha
m
ano
Docu
m
entation: git
.
html/
g
it
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Ju
n
io C H
a
mano
Mer
g
e http:/
/
www
.
k
ernel
.
or
g
/pub/scm/git
k
/git
k
commit
|
commitdiff
|
tree
2005-12-07
J
u
n
io
C Hamano
update-index: allow
--in
d
ex-in
f
o t
o
a
dd higher st
a
ges
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
J
unio C
Hamano
git-merge-one: new
mer
g
e w
o
rld order
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Junio C Hamano
checkout
-
index: allow checkin
g
out f
r
om highe
r
stag
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
J
a
son Riedy
Use print
f
ra
t
her
t
han echo -n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
J
unio C Ham
a
no
q
s
ort() ptr
d
iff_t m
a
y be la
r
ger than int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-07
Jason
R
iedy
[PA
T
CH] Initial
AIX portability fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
unio C Hamano
git-merge-one-file: re
s
urrect leading
p
ath cr
e
atio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
Docum
e
ntaiton (read
-
tre
e
)
:
update d
e
sc
r
ipti
o
n
of 3-way
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C
H
aman
o
Doc
u
mentation
:
h
a
s
h
-
object
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C
H
am
a
no
write-tree:
check extra
a
rguments
a
nd die but
b
e
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C
Hamano
init-db: check extra
argu
m
ents and
c
o
m
plain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio
C
Haman
o
h
ash-obje
c
t: -- and --
h
e
lp
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
J
on
L
oelig
e
r
Added d
o
c
umen
t
ation fo
r
few missing option
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Juni
o
C Ham
a
n
o
git
-
m
v
to work with Perl 5
.
6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-06
Junio C Hamano
F
ix 5501 t
e
st
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 Hamano
Clean up compatibility de
f
ini
t
ions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jas
o
n Riedy
[
PA
T
C
H] Document confi
g
.
mak i
n
INST
A
LL
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio
C
Ha
m
ano
confi
g
.
c
: re
m
o
v
e
unnecessary header in minimum
c
on
f
iguration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io C Hamano
s
er
v
er-info
.
c:
and two f
u
nc
t
ions are no
t
u
sed any
m
ore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
i
o
C
H
amano
server-info
.
c: use pac
k
_local like everybod
y
else
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Jun
i
o
C
Haman
o
Documentation: shared re
p
o
sitor
y
management in t
u
t
or
i
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C Hamano
Doc
u
men
t
at
i
on
:
p
ush/receive
h
o
ok referen
c
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ham
a
no
Docu
m
entation: g
i
t
-diff as
c
iidoc table w
o
rkaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Ha
m
ano
Documentation: git-mv manpage workaround
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Ju
n
io C
H
am
a
no
Documentation: tal
k
a
b
out pathspec in bise
c
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
amano
s
e
rver-
i
nfo: throw
away
T
c
omp
u
tation as
w
e
ll
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
server-inf
o
: sto
p
sort
i
ng pac
k
s by
la
t
est
d
a
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
nio C Hama
n
o
ser
v
er-in
f
o
.
c
:
drop unused
D
l
ines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C
H
amano
sha1_file
.
c: make
sure p
a
c
k
s
i
n an alternate
o
db is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
J
u
ni
o
C Hamano
git
.
c: rem
o
ve excess o
u
tput f
o
r debugging when
c
ommand
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Juni
o
C H
a
mano
s
t
ruct tree: r
e
mo
v
e u
n
u
s
ed fi
e
ld "parent"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
Documentatio
n
: rebase does not us
e
ch
e
rry-pick anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Petr Baudis
Document the -
-
(no-)edit switch of git-revert and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Junio C Hamano
show-
b
ranch:
a
llow
g
lob patte
r
n t
o
n
ame branches to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-05
Pe
t
r
Baudis
Upd
a
te t
h
e git-ls-tre
e
documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C
Hamano
g
i
t
.
c: two
fixes, gitse
t
env type and o
f
f-by-one error
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio
C Hamano
com
p
at/setenv
:
do not free what we fed p
u
t
e
n
v(3
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Danie
l
Barkalow
Warn when
s
end-p
a
c
k
d
o
es not
h
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Junio C
H
amano
[PAT
C
H] daemon
.
c
and
path
.
ent
e
r_repo(): rev
a
mp path
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
H
.
Peter
Anvin
A few more options for git-cat-file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-04
Jason Riedy
Add compat/se
t
env
.
c, us
e
in
git
.
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
ri
k
Kuivinen
New test case: Criss-cross merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik
K
uivine
n
New test case: merge wit
h
directory/file conflicts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
tes
t
-lib
.
sh: Add new f
u
nction, test_exp
e
ct_c
o
de
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuiv
i
nen
git-merge:
E
xit with code 2 if
no
strategy was able
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No nam
e
docume
n
tation: git-tag
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C Hamano
doc
u
mentation
:
git-bi
s
ec
t
(
h
elp HT
M
L
break
m
an)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
No name
documentation: clarify r
e
ad-tree --reset
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C
H
amano
git-
m
erge docume
n
tati
o
n: conflicting merge
leaves hi
g
h
er
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
uni
o
C
Hamano
merge
-
one-
f
ile: mak
e
s
ure we
do not
m
ismer
g
e s
y
mbolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio
C
Hamano
m
e
rge-one
-
file: make sur
e
we create the
merge
d
file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
t31
0
0: add ls-
t
ree -t and -d tes
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
ni
o
C Hamano
merge-r
e
curs
i
ve: a
d
ju
s
t gi
t
-ls-tree use for the latest
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Alex
R
ie
s
en
gi
t
wrapper: more careful argument
s
tuffin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Ju
n
io
C Ham
a
n
o
git-mer
g
e-one-file: do not worry abo
u
t 'rmdir -p' no
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio C Hamano
ls-tree: --na
m
e-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
J
u
nio C Hamano
ls-tree: resurrect '-d' t
o
m
e
an 'show trees only
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Linus
Torvalds
git-
l
s-tree: add
"
-t" optio
n
to always show the
tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
M
akefile: say t
h
e default ta
r
ge
t
upfr
o
nt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C
H
a
mano
Documen
t
ation: describe
'-f'
o
ption to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Timo Hirvonen
Move couple of i
f
defs after "include config
.
m
k
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Me
r
ge branch 'jc/subdir'
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
i
o
C
Hamano
Merg
e
b
ranches 'jc/a
p
ply',
'
lt
/
ls-t
r
ee', 'lt/bis
e
c
t
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
Tommi Virtanen
Do
n
ot atte
m
pt to acc
e
ss literal
d
irname
"
G
IT_OBJEC
T
_DIRECTORY"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
Tutorial: ad
j
ust
m
erge examp
l
e
t
o
recurs
i
ve str
a
t
eg
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C
Ha
m
ano
merg
e
-r
e
c
u
rsive: match the unmerged i
n
de
x
e
n
try behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hama
n
o
diff-files:
s
how
d
i
f
fs
with s
t
age0
a
nd unmerge
d
stag
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Li
n
us Torvalds
mer
g
e
-one
-
file
:
lea
v
e unmerged index ent
r
ies 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 aga
i
ns
t
unmerged st
a
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio
C H
a
mano
git-diff: do not
turn off -p/-M wi
t
h an
y
diff options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
Merge http
:
//www
.
kernel
.
org/pub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2005-11-29
Alex Riesen
[PATCH] Add test
s
for git-mv i
n
subd
i
rectories
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 Schind
e
li
n
[PATCH
]
Make
g
it-mv work in subd
i
rectories, t
o
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Ha
m
ano
format-patch: run diff in C locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
f
o
rmat-patch: do not abuse 3-d
a
s
h
marker line
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
amano
forma
t
-pat
c
h:
re
m
ove applie
s
-
t
o
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
a
pplypatch:
u
se "index" lines
n
ot
"appl
i
es-to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
app
l
ymbox: ty
p
ofi
x
to ena
b
l
e
-m option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
M
a
tt
h
ias Urlichs
S
V
N import: Us
e
one lo
g
call
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
j
d
l@free
s
c
ale
.
c
o
m
Fi
x
t
y
pos
a
n
d
m
inor fo
r
mat is
s
ues
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Nic
k
H
e
ngeveld
http-push cle
a
nup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Pave
l
Ros
k
in
git-cl
o
ne -
-
share
d
should imply
-
-local
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
hash-object
.
c
:
t
y
p
e-fix to sq
u
el
c
h co
m
pile
r
warn
i
n
gs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C H
a
mano
define die()
for scripts th
a
t use it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
Hama
n
o
ve
r
ify-
t
ag: mak
e
it operable from a subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
tag:
make it
o
p
e
rabl
e
from a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
lo
s
t-
f
o
und: make i
t
o
perable f
r
om a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
branch: make it opera
b
le
f
rom a s
u
bdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
ls-remote: d
e
fine die() now w
e
do not use g
i
t-sh
-
setup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
count-objects: make it o
p
e
rable
f
r
o
m
a
s
u
b
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hamano
Make
t
he rest of comm
a
nds work from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o
C Hama
n
o
Make networking
c
omm
a
nds
t
o wo
r
k fr
o
m a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next