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
Teach 'git merge' that some merge strategies no longer exist
2008-07-20
Miklos Vajna
Teach
'gi
t
merge' that
s
ome m
e
rge s
t
rate
g
ies no l
o
n
g
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Lars Nosch
i
nski
c
v
sserver: Add test
s
uite
f
or
packe
d
refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Ju
n
io C
H
amano
G
e
tting closer to 1
.
6
.
0-rc
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C
Haman
o
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2008-07-19
Alexander Gav
r
ilov
Support gitlinks in fas
t
-imp
o
rt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
u
nio C Hamano
.
mailmap update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
P
e
tr B
a
udis
Documen
t
ation/git-merge
.
txt
:
Partial rewrite of How
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
René Scharfe
archive: r
e
move
u
nused
h
eaders
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
René Scharfe
a
r
c
hive: mak
e
zip compression level independent from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
P
etr Baudis
Documentat
i
o
n
:
How to ignore local c
h
ang
e
s in tr
a
c
ked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudis
Docum
e
ntation/git-submodule
.
txt
:
Further clar
i
f
y the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Pe
t
er Ha
r
ris
Add ANSI control code
emula
t
ion for
t
he Windows con
s
ole
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Johanne
s
Sixt
builtin-clone: re
w
rite guess_di
r
_n
a
me()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Eric Ra
i
b
l
e
Teach lookup
_
p
rog
n
ot to se
l
e
c
t dire
c
tories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fabian Emme
s
testsui
t
e for c
v
s
co -c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Lar
s
Noschi
n
ski
cvsserver:
A
dd cvs co
-
c su
p
port
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
La
r
s Noschinski
cvsserver: Add support for pa
c
k
e
d
r
e
f
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fabian Emme
s
Tests
u
ite: Unset CVS_SERVER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
St
e
p
han Beyer
Link git-shell only to a subset of
l
ibgi
t
.
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Ju
n
i
o
C Hamano
t9001 (send-
e
mail
)
: Do not use hardcoded
/bin/sh
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
GIT 1
.
5
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
O
li
v
ier Marin
builtin-rm:
fix index l
o
ck
file path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Juni
o
C Hamano
Merge branch 'sp/maint-in
d
ex-pac
k
' into maint
commit
|
commitdiff
|
tree
2008-07-18
Junio
C Hamano
http-fetch: do not SEGV after fe
t
chin
g
a bad pack i
d
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
rev-list:
h
onor --quiet option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
builtin-re
m
ote
.
c:
f
ix earli
e
r
"s
k
ip
_
pre
f
ix()" conversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Stephan Beyer
api
-
r
un-com
m
and
.
tx
t
: ty
p
ofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
P
e
tr Baudis
Documenta
t
ion/RelNotes-1
.
6
.
0
.
txt:
E
xpand
o
n
t
he incom
p
atible
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
J
u
ni
o
C H
a
mano
mail
i
nfo: off-by-
o
ne fix for [
P
AT
C
H (foobar)] removal
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
Hamano
read
-
cache
.
c: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C H
a
ma
n
o
Up
d
ate draft rel
e
ase notes
for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Juni
o
C Ham
a
n
o
Me
r
g
e br
a
nch 'mv/dashless'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Haman
o
Merge branch
'ls/mailinfo'
commit
|
commitdiff
|
tree
2008-07-17
Petr
B
audis
Documentation/git-submodule
.
tx
t
: A
d
d Des
c
r
i
ption section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Ju
n
io C Hamano
Merge branch 'sb/dashless'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge
br
a
nch 'rs/archive'
commit
|
commitdiff
|
tree
2008-07-17
Junio C H
a
mano
Mer
g
e bra
n
c
h 'ag/blame'
commit
|
commitdiff
|
tree
2008-07-17
J
unio C Ham
a
n
o
Merge branch '
r
s/rebase-checkout
-
not-so
-
quie
t
'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
am
a
no
M
erge branc
h
'sp/maint-index-pa
c
k'
commit
|
commitdiff
|
tree
2008-07-17
Junio
C Hamano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio
C Haman
o
Start preparing 1
.
5
.
6
.
4
release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Schindel
i
n
gi
t
fe
t
ch-pac
k
:
do
n
ot co
m
plain about "no common commits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch
'
js/maint-prett
y
-mailmap
'
into maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch 'sp/maint-bash-c
o
mpletion-opti
m
' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio C
Hamano
Merge branch 'sp/maint
-
pack-memu
s
e' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge
b
r
anch '
l
s/maint-ma
i
li
n
f
o
-patch-
l
abel' into ma
i
nt
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
io
C
Hamano
Merge branch 'js/maint
-
da
e
mo
n
-syslo
g
' into maint
commit
|
commitdiff
|
tree
2008-07-16
Step
h
an Beyer
rebase-i
:
keep old parents w
h
en p
r
eserving
m
er
g
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
J
oh
a
n
ne
s
Sixt
t7600
-
merge: Use test
_
expect
_
failure
to
test option
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmi
t
ry Potapov
Fix bu
f
fer overflow in prepa
r
e_at
t
r_s
t
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmi
t
ry Potapo
v
Fix buffer o
v
erf
l
ow
in git di
f
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Potapov
Fix
buffer overflow in g
i
t-grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
S
u
ngHyun Nam
t/
M
akefile: use sp
e
cifi
e
d
shel
l
when running
aggreg
a
t
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Lars Noschinski
git-cvsse
r
ver: fix c
a
ll to
n
onex
i
stant cleanup
W
orkDir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako
S
h
iraishi
pa
r
s
e
-
o
ptions
.
c: ma
k
e check_t
y
pos() static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shira
i
shi
builtin-
d
escribe
.
c
:
make a
glob
a
l va
r
iable "pattern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Sh
i
raishi
cache-tr
e
e
.
c: make cache_tree_find(
)
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Petr Baudis
Documentation
/
gi
t
-ch
e
rry-pick
.
t
x
t
et a
l
.
: Fi
x
mis
l
e
a
ding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio
C
Hamano
t/aggregate
-
resu
l
ts:
whitespace fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Eric Wong
t
/
lib-
g
it-
s
vn:
f
ix SVN_H
T
TPD t
e
sts to work with "tra
s
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Haman
o
Merge bran
c
h 'mv/merge-in-c'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Haman
o
Merge branch
'
ag/rewri
t
e_on
e
'
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o C Hamano
Merge branch 'sp/win'
commit
|
commitdiff
|
tree
2008-07-16
Junio C H
a
mano
Merge
b
ranch '
j
s
/more-
w
in'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge
b
ranc
h
'js/mai
n
t-pretty-mailmap'
commit
|
commitdiff
|
tree
2008-07-16
J
ohannes
S
chindelin
Renam
e
"
.
dotest/" to "
.
git/rebase
"
and "
.
dotest-merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ale
x
ander Gavr
i
lov
D
o not
t
r
y to
de
t
ect m
o
ve/c
o
py for entries below
th
r
eshold
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Alexander Gavrilov
Avoid rescanni
n
g unchanged entries
in s
e
arch for copies
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
J
unio C Ha
m
ano
Upda
t
e d
r
aft release notes to 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Joh
a
nnes
S
chindelin
sh
o
rtlog: support --pr
e
tty=format
:
op
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ciaran McCreesh
Make git-add -i a
c
cep
t
ranges lik
e
7-
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Pavel Roskin
t9600: al
l
ow testing with cvsps 2
.
2,
i
ncl
u
ding be
t
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
archive:
re
m
ove extr
a
arguments pars
i
ng code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Sc
h
a
rfe
arc
h
ive:
u
n
i
fy file attribute h
a
nd
l
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René
Scharfe
archive: c
e
n
t
ralize
a
rchi
v
e ent
r
y writing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Scharf
e
archive: add baselen member to struct archiv
e
r_args
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
add
context poin
t
er to rea
d
_tree
_
r
e
cursive()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
René S
c
ha
r
fe
ar
c
hive: rem
o
ve arg
s
m
e
m
ber from struc
t
archiver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
inde
x
-pack
:
Honor core
.
de
l
taBase
C
acheLimit when re
s
olvin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
i
ndex-pack: Track the object_entry t
h
a
t creates each
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
P
e
arce
index-pack: Cha
i
n the struct base_dat
a
on
the st
a
ck
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Sha
w
n
O
.
Pearce
index-pack:
R
ef
a
ctor base arguments of resol
v
e_delta
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
J
unio C Hamano
Merge git:/
/
repo
.
o
r
.
c
z
/
git-gui
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge branch 'js/merge-r
r
'
commit
|
commitdiff
|
tree
2008-07-15
J
u
nio
C H
a
mano
Merge
branch 'sb/rerere-lib'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge branch
'ls/maint
-
m
a
i
l
i
nfo-patch-label
'
commit
|
commitdiff
|
tree
2008-07-15
Juni
o
C Hamano
Merg
e
branch 'om/rerere
-
careful'
commit
|
commitdiff
|
tree
2008-07-15
Junio
C Ham
a
no
Merge
bran
c
h 'jc/b
r
an
c
h-merged'
commit
|
commitdiff
|
tree
2008-07-15
Junio C
Hama
n
o
Merge branch 'jc/rebase-
o
rig
-
head'
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pear
c
e
b
ash completio
n
: Remove d
a
shed comma
n
d
completion support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge
b
ranch '
s
p/maint-bash-completion-op
t
im'
commit
|
commitdiff
|
tree
2008-07-15
N
ic
o
l
as Pitre
re
s
t
o
r
e legacy behavi
o
r for
read_s
h
a1_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Teemu Likonen
bash
:
Add long option
comple
t
ion for
'git send-email'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Mark Levedahl
git-submodule
-
r
e
gi
s
ter subm
o
d
ule U
R
L
if ad
d
ing in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Mark Le
v
e
dahl
gi
t
-submodule - make "submodule add" more strict, a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Frede
r
ik Schwar
z
er
git-svn
:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
João Abecasis
gi
t
-svn
:
find-rev
and rebase for
S
V
N
::Mirror
repositories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
t
ut
o
rial: clarify "pull" i
s
"fetch + me
r
ge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ian Katz
tutoria
l
: use prompt
w
ith user
n
ames in
e
xample, to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
P
earce
bash completion: Reso
l
ve git show ref:p
a
th<tab> losing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next