repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Teach 'git merge' that some merge strategies no longer exist
2008-07-20
Miklos Vajna
Teach 'git merge'
that s
o
me merge strategies no
l
o
n
ger
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
L
ars Noschinski
cvss
e
rver: A
d
d
testsu
i
t
e
for
p
acked
r
efs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Ha
m
an
o
Getti
n
g
closer t
o
1
.
6
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
unio
C Ha
m
a
no
Mer
g
e branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2008-07-19
Al
e
xande
r
G
avril
o
v
Support gitlinks i
n
fast-impo
r
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
.
mailmap updat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baud
i
s
Documentation/git-
m
erge
.
txt: P
a
rti
a
l r
e
w
r
it
e
of How
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
René Scharfe
arch
i
ve: remo
v
e u
n
u
s
ed headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Re
n
é
Scharfe
archive: make zip compression level indepe
n
dent
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
P
etr Ba
u
dis
Docu
m
ent
a
tio
n
: How to ignor
e
local changes
i
n
tracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudis
Docu
m
en
t
ation/git-subm
o
dule
.
txt:
F
ur
t
her clarify the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Peter
H
arris
Add A
N
S
I
con
t
rol code emulat
i
on for
t
he Wind
o
ws console
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Jo
h
annes Sixt
bu
i
ltin-clone:
r
ewrite guess_d
i
r_
n
am
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Eric Rai
b
le
Teach lookup_prog
n
o
t
to
select di
r
e
c
t
o
ri
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
F
abian Emm
e
s
testsuite
for c
v
s co
-
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Lars N
o
s
c
hinski
cvsserver:
A
d
d cvs co -c
s
u
p
port
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Lars Nosch
i
nski
cvsserve
r
: A
d
d
s
u
pport f
o
r pac
k
ed
r
efs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fabian Emme
s
Testsuite: U
n
set CVS_SERVER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Stephan Bey
e
r
Link g
i
t-sh
e
ll only t
o
a s
u
bset of lib
g
it
.
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
t9001 (
s
end-email): Do n
o
t
use hardcoded /bin/s
h
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
u
nio C Hamano
GIT
1
.
5
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Olivier
M
arin
builtin-
r
m
: fix index lock file path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C
Ha
m
ano
Me
r
g
e branch 'sp/m
a
int-ind
e
x-
p
ack'
into maint
commit
|
commitdiff
|
tree
2008-07-18
J
u
n
io C Hamano
http-fet
c
h: do not
SEGV a
f
ter fe
t
ching
a b
a
d pack idx
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C
Haman
o
re
v
-
l
ist: honor --quie
t
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Ju
n
io C Haman
o
builtin-remo
t
e
.
c: fix earlier "s
k
ip_prefix(
)
" c
o
nve
r
si
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Stephan Be
y
er
a
p
i-run-command
.
txt: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
P
etr B
a
udis
Documentation/RelNotes-
1
.
6
.
0
.
txt: Expand on the incompa
t
ible
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
maili
n
fo: off-by
-
one fix
for [PATCH (fo
o
bar)] r
e
mova
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Haman
o
r
ead-cache
.
c: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
U
p
date draft release
n
o
tes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge
branch
'
m
v/da
s
h
less
'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
Hamano
Mer
g
e
bra
n
ch 'ls/
m
a
ilinfo'
commit
|
commitdiff
|
tree
2008-07-17
Petr Baudis
Documenta
t
ion/git-submodule
.
txt
:
Add Description
section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o C Hamano
Merge branc
h
'sb/dashless'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
amano
Merge
branch 'rs/archive'
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o
C H
a
mano
Merge bran
c
h 'ag/blame'
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
Hamano
Merge
b
ra
n
c
h
'rs/re
b
ase-checkout-not-so-
q
uiet'
commit
|
commitdiff
|
tree
2008-07-17
J
unio
C H
a
mano
Merge
b
ranch 'sp/maint-ind
e
x-pack'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Ha
m
ano
Start pr
e
paring 1
.
5
.
6
.
4 release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Johannes
S
chindelin
git f
e
t
c
h-pack: do n
o
t
complain about "no c
o
mmon commits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hama
n
o
Merge
b
ranch
'js/maint-pret
t
y
-
mailma
p
' i
n
to m
a
int
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o C Haman
o
Merge branch 'sp/maint-b
a
sh-c
o
mpletion
-
optim'
into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio
C
Hamano
M
erge branch
'
sp/maint-pac
k
-memuse' into maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C H
a
mano
M
erge branch
'ls/maint-mailinfo-patch
-
l
a
bel'
i
nto maint
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C
H
a
mano
Merge bra
n
ch 'j
s
/maint-daemon-s
y
slog'
int
o
maint
commit
|
commitdiff
|
tree
2008-07-16
Stephan Beyer
rebas
e
-i:
k
eep old pare
n
ts when p
r
eserving merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Johan
n
es Sixt
t7600-merge: U
s
e tes
t
_expect_failur
e
to test
o
ption
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Pota
p
ov
Fix
b
uffer overflow
in prepare_attr_stack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dm
i
try Pota
p
o
v
Fix buffe
r
overflow in git d
i
ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Potapov
Fix
bu
f
fer overflow in g
i
t-grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Sun
g
Hyun Nam
t/M
a
kefile: us
e
specified shel
l
when runni
n
g aggregation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Lars Noschinski
git-cv
s
server: fix cal
l
to nonex
i
s
tant cl
e
anupWork
D
ir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako
S
hiraishi
parse-opt
i
ons
.
c: make
check_typos() s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako S
h
i
r
a
i
shi
bu
i
l
t
in-
d
e
s
c
r
i
be
.
c: make a
global varia
b
l
e
"pattern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako
S
hiraishi
cache-tree
.
c: m
a
k
e
c
ach
e
_tree_find() sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Petr
Baudis
Documentation/git-cherry-pick
.
txt et al
.
: Fix misleadi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
t/aggre
g
ate-results: white
s
pace fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Er
i
c
Wong
t/lib
-
git-svn
:
fi
x
SVN_HTTPD tests t
o
wor
k
with
"trash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C H
a
mano
M
e
rge branch 'mv/merge-
i
n-c'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C
Hamano
Merge branch '
a
g/rewr
i
t
e
_one
'
commit
|
commitdiff
|
tree
2008-07-16
Junio
C Hamano
M
e
r
g
e branch 'sp/win'
commit
|
commitdiff
|
tree
2008-07-16
Junio
C
H
ama
n
o
Me
r
ge branch 'js/mo
r
e-win'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Ham
a
no
Merge br
a
n
c
h
'js/ma
i
nt-
p
retty-m
a
ilmap'
commit
|
commitdiff
|
tree
2008-07-16
Johannes Schindelin
Re
n
ame "
.
d
o
test/" t
o
"
.
git/re
b
a
s
e"
a
nd "
.
dot
e
s
t-merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Alexander Gavrilov
Do not t
r
y to detect move/copy fo
r
en
t
ries be
l
ow th
r
eshold
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Alexander
Ga
v
r
i
l
o
v
Av
o
id rescanning un
c
hanged e
n
trie
s
in sear
c
h
for copies
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio
C Haman
o
Upda
t
e
d
raft relea
s
e
no
t
es to
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Joha
n
nes Schindelin
shortlog: support --pretty=f
o
r
mat: opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
C
i
ar
a
n McCreesh
Make git-add -i a
c
cep
t
ranges like 7-
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Pave
l
Roskin
t96
0
0: allow testi
n
g with cvsps 2
.
2
, including
b
eta
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Scharf
e
ar
c
hive:
r
emov
e
e
xtra arguments parsing code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Sc
h
arfe
arch
i
ve: unify fi
l
e at
t
rib
u
te
h
andlin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
R
e
né
Sc
h
ar
f
e
archive: centra
l
ize archive entry writing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Schar
f
e
archive: add baselen member to st
r
uct archiver_args
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Re
n
é
Scharfe
a
d
d con
t
ext pointer t
o
read_tre
e
_recursive()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
R
ené
S
charf
e
archive: re
m
ov
e
args mem
b
er from struc
t
a
r
c
h
i
ver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
P
e
arc
e
index-pack: H
o
nor
c
ore
.
del
t
aBaseCacheLimit when reso
l
v
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
P
e
arc
e
index-pack: Track th
e
objec
t
_entry that creates each
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
in
d
ex-pack: Chain the
struc
t
base_data on the stack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shaw
n
O
.
Pearce
index
-
pack: Refact
o
r base arg
u
ments of
reso
l
ve_delta
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
Hama
n
o
Me
r
ge
git://rep
o
.
or
.
c
z
/g
i
t
-
gui
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
Hama
n
o
Merge branc
h
'js/mer
g
e-rr'
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
Hamano
Me
r
g
e branc
h
'sb/rerere-lib
'
commit
|
commitdiff
|
tree
2008-07-15
Junio C
Ha
m
ano
Merg
e
branch 'ls/maint-ma
i
li
n
fo-patc
h
-lab
e
l
'
commit
|
commitdiff
|
tree
2008-07-15
Junio C
H
a
man
o
Merge branch 'om/
r
erere-careful'
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io C Hamano
Mer
g
e branch 'jc
/
branch-
m
erged'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hama
n
o
M
e
rge bran
c
h '
j
c/reba
s
e
-orig-h
e
a
d
'
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
P
e
arce
bash
c
omp
l
e
t
io
n
:
R
emove dashe
d
command completion suppor
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hama
n
o
Mer
g
e br
a
nch 'sp/m
a
i
n
t-bash-co
m
pletion-optim
'
commit
|
commitdiff
|
tree
2008-07-15
Ni
c
olas Pitre
restore lega
c
y be
h
a
v
ior for read_sha1_f
i
le()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
T
eemu
L
i
k
onen
b
ash: A
d
d
l
ong opt
i
on comp
l
etion f
o
r
'git send-
e
mail'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Mark
L
evedahl
git-submod
u
l
e
-
register submodule URL if a
d
d
ing in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Mark Levedahl
git
-
submo
d
ul
e
- make "submodule add" more
s
t
rict, and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Fre
d
erik Sc
h
warze
r
g
i
t-svn:
t
ypofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
João Ab
e
c
a
sis
git-svn: fi
n
d-rev a
n
d rebase for SVN::Mirror r
e
positori
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
tutorial:
cla
r
i
f
y "pull" is "fet
c
h + merge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ian Katz
tutorial:
u
se prompt with u
s
er
n
ames i
n
e
xample, t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shaw
n
O
.
Pearce
bash completion: Reso
l
ve git sh
o
w ref:
p
ath<tab>
l
o
si
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next