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-file: refuse to merge binary files
2007-06-05
Johanne
s
S
chind
e
lin
git-merge-file: ref
u
se
t
o merge
binary
files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-06-05
Johan
n
es Schi
n
d
elin
m
e
rge-re
c
ursi
v
e: refuse t
o
merge bina
r
y
f
i
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-06-05
Johannes Sc
h
indelin
Move b
u
ffer_is_binary() to xdiff-
i
nterface
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-06-05
Johannes S
c
h
indelin
g
it-fsc
k
: learn abou
t
--verbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-06-03
Martin K
o
e
gl
e
r
g
i
t
web: Handle non
UTF-8 text better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-06-03
Randal L
.
S
chwartz
A
d
d test
-
sha1 t
o
.
g
itignore
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-06-03
Junio C Hamano
git-apply: what is det
e
cted and fixe
d
is
not just tr
a
i
ling
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-06-03
Joha
n
nes Schi
n
delin
Up
d
ate to Sub
m
it
t
in
g
Patc
h
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-06-03
Junio C Hamano
Merge bran
c
h 'maint' to
sync wi
t
h 1
.
5
.
2
.
1
commit
|
commitdiff
|
tree
2007-06-03
J
u
n
io
C
Hamano
Release Notes:
start prepar
i
ng for 1
.
5
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-06-03
Juni
o
C Haman
o
Mer
g
e
b
ranches
'
l
h
/
submodules' and 'pb/am
'
commit
|
commitdiff
|
tree
2007-06-02
J
u
n
i
o
C Hamano
GIT 1
.
5
.
2
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-06-02
Lars Hjemli
A
d
d
basic test-scri
p
t
for git-submodule
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-06-02
Junio C Ha
m
ano
Merge branch 'np/pac
k
'
commit
|
commitdiff
|
tree
2007-06-02
Junio C Hamano
Me
r
ge b
r
anch 'sp/pack'
commit
|
commitdiff
|
tree
2007-06-02
Jonas Fo
n
seca
git-rebase: sug
g
est
t
o use git-ad
d
instead of
git
-
up
d
ate
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-06-02
Junio C Hamano
Merge
bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2007-06-02
Kr
i
stian Høg
s
berg
Us
e
=20
w
hen
r
fc2047 en
c
od
i
ng spaces
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-06-02
Josh Triplett
C
r
eate
a ne
w
ma
n
page
f
o
r
the gitigno
r
e format, and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-06-02
Jeff King
Doc
u
mentation: robus
t
ify ascii
d
oc GIT_VERSIO
N
replacement
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-06-02
Jonas F
o
n
s
eca
Fix git-am
(
1) synopsis formatting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-31
Theodore Ts'o
Fix m
i
nor gram
m
atical typos
in the g
i
t-gc man
p
age
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-31
M
a
rti
n
K
oegl
e
r
diff-delta:
use
r
ealloc instead of xrealloc
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-31
Junio C Hamano
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-05-31
J
uni
o
C Ha
m
ano
Merge branch
'
maint-1
.
5
.
1'
into
m
aint
commit
|
commitdiff
|
tree
2007-05-31
Fran
k
Lichtenheld
g
i
t-conf
i
g: Improve documentation of g
i
t-con
f
ig fi
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-31
F
r
ank
Li
c
htenheld
git-con
f
i
g
: Various small
f
ixes to asciidoc docu
m
entation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-31
Nicolas Pitre
al
w
ays start look
i
ng up objects in the l
a
s
t
used
pack
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-31
Nico
l
as Pit
r
e
fix re
p
ack with
-
-max-pack-size
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-31
Julian Phillips
Makefile
:
U
s
e generic ru
l
e
t
o
b
u
ild
test prog
r
ams
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-30
Je
r
al
d
Fit
z
jerald
decode_85(): fix mi
s
sing return
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-30
Linus Torvalds
fix
signed range proble
m
s with hex conversions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-30
Junio C Hamano
Add DLH to
.
m
a
ilmap
commit
|
commitdiff
|
tree
2007-05-30
Sh
a
wn O
.
Pearce
S
tyle nit - don't put space after function names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-30
S
h
awn
O
.
Pearce
Ensure th
e
p
a
ck index i
s
opened before ac
c
es
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-30
Shawn
O
.
Pearce
Simplify index access condit
i
on in count-ob
j
ects, pack
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-30
S
h
awn
O
.
Pearce
T
e
st for recent r
e
v-parse $abbre
v
_
sha
1
re
g
res
s
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-30
James Bowes
rev
-
parse: Identif
y
short sha1 sums correctly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Ma
r
tin
K
o
egler
bu
i
ltin-pack-object:
c
ache small deltas
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Mar
t
i
n
Koegler
git
-
p
ack-objects: cache small
delta
s
betwe
e
n big
o
bjects
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Martin
K
o
e
g
ler
builtin-
p
a
ck-objec
t
s: don't fa
i
l,
i
f delta is not possi
b
le
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Juni
o
C H
a
man
o
Merge b
r
a
n
ch 'db
/
remo
t
e
'
commit
|
commitdiff
|
tree
2007-05-29
Junio
C
Haman
o
M
e
rge b
r
anch 'dh/repac
k
' (early part)
commit
|
commitdiff
|
tree
2007-05-29
Jun
i
o
C H
a
mano
Merge branch '
n
p/delta'
commit
|
commitdiff
|
tree
2007-05-29
Junio C Hamano
M
e
rge
b
ranch 'jc/nodelta'
commit
|
commitdiff
|
tree
2007-05-29
Junio C Hamano
Merg
e
branch 'ar
/
ve
r
bose'
commit
|
commitdiff
|
tree
2007-05-29
J
u
nio C Hamano
M
erge branch 'ar/ru
n
'
commit
|
commitdiff
|
tree
2007-05-29
Junio C
Ha
m
ano
Merge bran
c
h
'ar/m
e
rge
s
t
a
t'
commit
|
commitdiff
|
tree
2007-05-29
Juni
o
C
H
amano
Merg
e
branch 'rr/cv
s
export'
commit
|
commitdiff
|
tree
2007-05-29
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-05-29
Frank Lichte
n
he
l
d
cvsse
r
ver: Hand
l
e 'cvs login'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Frank Lichtenhe
l
d
t94
0
0
:
Work
around CVS' deficienci
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Shawn O
.
Pearce
Allow cont
r
ib n
e
w-workdir to link into bare re
p
o
s
itor
i
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Junio C Haman
o
ma
i
lsplit: fix for more
t
h
an one input
f
iles
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Fran
k
Lichtenheld
c
vsserve
r
: Fi
x
some typos in asciid
o
c documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Frank Licht
e
nheld
cvss
e
rver: Note that CV
S
_SERVER can also
be spec
i
fie
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Frank Lichtenheld
cvsserver
:
Correct i
n
etd
.
conf example in asciido
c
documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
S
teffen Pr
o
haska
user-m
a
n
ual: fixed
t
ypo
in ex
a
mple
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Andy
Parkins
A
dd t
e
st
case for $Id$ expanded
i
n the r
e
pository
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Junio C Hamano
M
erge branch 'mai
n
t-1
.
5
.
1'
i
n
to maint
commit
|
commitdiff
|
tree
2007-05-29
Eric
Wong
g
it-s
v
n: avoid md5 calcul
a
tion e
n
t
i
r
ely if SVN
d
oesn
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-29
Juni
o
C
H
amano
Merge
b
ranch '
m
aint' of git://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-05-29
Nguyen
T
hai Ngoc Duy
Ma
k
ef
i
le:
R
em
o
ve
git
-
fsck
a
n
d g
i
t-verify-pack fro
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-28
Johan Herland
F
ix stupid typo in
loo
k
up_tag()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-27
Nicolas Pitre
update diff-delta
.
c copyright
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-27
Nicolas Pitre
improve del
t
a long block match
i
ng w
i
th big files
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-27
Shawn O
.
Pearce
Attempt to delay prepare_alt_odb during
get_s
h
a1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-27
Shawn O
.
Pe
a
rce
Micro-
o
ptimi
z
e prepar
e
_
alt_odb
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-27
Shawn O
.
Pearce
Lazily o
p
en pack index f
i
les on
d
e
m
and
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-27
Lars Hjemli
Add g
i
t-submodule command
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-27
Linus
Torvalds
Make the pack-r
e
fs
interfaces usa
b
le
f
rom
o
utside
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-27
Junio
C
Haman
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-05-26
Junio C Hamano
Merge bran
c
h 'maint
-
1
.
5
.
1' into
main
t
commit
|
commitdiff
|
tree
2007-05-26
Daniel B
a
rkalow
Mo
v
e
r
efspec pattern matc
h
i
ng to matc
h
_refs()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-26
James Y Knight
Fix git-svn to handle sv
n
not
r
ep
o
rtin
g
the md5sum
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-26
Andy Park
i
ns
F
i
x
mi
s
handli
n
g o
f
$Id$ expande
d
i
n
t
he re
p
osit
o
ry
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-26
Jeff Ki
n
g
More echo "$user_mes
s
age" fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-26
Junio C Hamano
Add
t
e
sts f
o
r
th
e
last
two fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-26
J
unio C Hamano
gi
t
-commit: use printf '%s
\
n'
i
nstead of ech
o
on
user
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-26
Jeff King
git-
a
m:
use printf inst
e
ad of
ech
o
on user
-
sup
p
lied
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-26
Nicol
a
s Pitre
fix
e
s to out
p
u
t
of git-verify-pa
c
k -v
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-26
Jakub Narebski
Doc
u
mentation: A
d
d d
e
finiti
o
n
o
f "evil merge" to G
I
T
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-26
Jakub Narebsk
i
Repla
c
e the last 'dircache's by 'i
n
d
e
x'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-26
Jakub N
a
rebski
Docum
e
ntation: Cl
e
an u
p
links in GIT Glossary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-25
Alex Ri
e
sen
Add a configuration optio
n
to control
dif
f
stat after
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-25
A
lex Riesen
Add ano
t
her
v
erbosity lev
e
l to git-fetch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-25
A
lex R
i
esen
Verbose connect
message
s
to sho
w
t
h
e IP
a
ddre
s
ses used
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-25
Robin Rosenberg
Add
option to cvs
update b
e
fore e
x
port
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-25
Jun
i
o C Ha
m
ano
R
e
move
g
i
t
-a
p
pl
y
patc
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-25
Petr Baudis
git-ap
p
lymbox: R
e
m
ove command
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-25
J
u
nio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-05-25
Junio C Ha
m
ano
M
e
r
g
e
br
a
n
ch 'master'
of git:
/
/re
p
o
.
or
.
cz/git/fastimp
o
r
t
.
.
.
commit
|
commitdiff
|
tree
2007-05-25
Dan
a
How
Ensure git-repack
-a -d --m
a
x-pack-size=N dele
t
e
s
corr
e
ct
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-25
Linus Torval
d
s
M
a
ke "git
g
c" pa
c
k all refs by default
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-25
Fer
n
ando J
.
Pereda
Teach mails
p
l
it about
M
aild
i
r's
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-25
Junio C Hama
n
o
Merge branch 'maint-1
.
5
.
1'
i
n
t
o maint
commit
|
commitdiff
|
tree
2007-05-25
Carlos Rica
fix me
m
ory leak
in pa
r
s
e
_
o
b
ject w
h
en c
h
eck_sha1_si
g
nature
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-24
Junio C Hamano
name-
r
ev
:
tolerate clock
skew i
n
co
m
mitter dates
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-24
Alex Riesen
Allow environment va
r
iables t
o
be unset in t
h
e
p
roce
s
ses
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-24
A
l
ex Riesen
A
dd ability to
s
p
ecify
en
v
i
ronment extension to run_
c
omman
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next