repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-merge: give a proper error message for invalid strategies in config
2008-07-22
M
i
klos Vajna
builtin-merg
e
: give
a
pr
o
per error messag
e
for invalid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Jun
i
o
C
H
amano
tests: do not r
e
ly on
externa
l
"
p
atch"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Nikolaj Sch
u
macher
Don't cut off las
t
c
h
aracter
of commit descripti
o
n
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Mari
n
parse-options: fix
s
egme
n
t
a
tion faul
t
when a required
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Philippe Bru
h
at
.
.
.
mail
i
n
f
o:
b
et
t
er parse emai
l
adres
s
es containg parentheses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
git-am: remove d
a
sh from he
l
p
me
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
J
u
nio C Hamano
Revert "make
g
it-status
u
se a pager"
commit
|
commitdiff
|
tree
2008-07-22
Jonath
a
n Nieder
git-d
i
ff(1
)
: "--c" ->
"
-
-
cc" typo
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Johanne
s
Schind
e
lin
Rename
p
a
t
h_li
s
t
to
string_
l
ist
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
J
o
hann
e
s Schindelin
Rename
.
g
it
/
r
e
base to
.
git/
r
ebase-apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Update my e-mail
address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C Hamano
Merge branch 'a
p
/
t
ra
c
kinfo
'
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
a
man
o
Merge branch '
j
c/r
e
rere
-
a
uto-mo
r
e'
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
a
m
ano
Mer
g
e branch 'ns/
a
m-
a
bort'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Merge bran
c
h '
j
c/add-addremove'
commit
|
commitdiff
|
tree
2008-07-21
Jun
i
o
C
Ha
m
ano
"
needs upda
t
e"
conside
r
e
d
harmful
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio
C Hamano
Mov
e
r
ead_in_full() a
n
d write_in_full()
t
o wrapp
e
r
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
J
un
i
o
C Ham
a
no
Link s
h
ell with
compat la
y
e
r
fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Jun
i
o C
H
amano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-07-20
D
m
itr
y
Potapov
git
-
svn: fix gi
t
svn
info to work without arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
M
i
chele Bal
l
abi
o
builti
n
-push
.
c: Cleanup - u
s
e OPT_BI
T
() and remove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
M
i
chele
Ballabio
builtin-merge
.
c: F
i
x o
p
tio
n
p
a
rsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Jon
a
t
h
an
Nieder
fix usage str
i
ng fo
r
g
i
t
g
r
ep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los V
a
jn
a
Teach '
g
it merge' that some
m
e
r
g
e
strategies no l
o
nger
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
L
a
rs Nos
c
h
inski
cvsserver: Add testsuite
f
o
r
packed ref
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio
C
Hamano
r
e
fre
s
h-ind
e
x: f
i
x bitma
s
k
a
ssignment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
u
n
io
C H
a
mano
git-add --all: documenta
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C H
a
m
a
n
o
git-add --all:
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
u
nio C
H
a
mano
git
-
add --all: add all files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
u
nio C Hamano
builtin-add
.
c:
r
estructure th
e
c
o
de for maintain
a
bi
l
ity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Juni
o
C Hamano
Getting closer to 1
.
6
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Nanako Shiraishi
git am --a
b
ort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
u
nio C Ha
m
a
n
o
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2008-07-19
A
lexander Gavrilov
Supp
o
rt gitlinks in fast-import
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
.
mailmap update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudis
Documen
t
ation
/
git-
m
e
r
g
e
.
t
x
t: Partial re
w
rite of
How
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
René Scharfe
archive: remove unused
headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
René Sc
h
arfe
ar
c
hi
v
e: make z
i
p c
o
mpressio
n
level independen
t
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
P
etr Baudi
s
Docume
n
tation: How to i
g
nore local ch
a
n
g
e
s in tracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Pet
r
Baud
i
s
Documentation/
g
it-submod
u
le
.
txt: F
u
rther clarify
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
P
et
e
r Harri
s
Ad
d
ANSI c
o
ntro
l
cod
e
e
mulation for the Win
d
ows con
s
ole
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Johanne
s
Sixt
builti
n
-clone: rewrite g
u
e
ss
_
di
r
_name()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
E
r
ic Raible
Teach loo
k
up_prog not to select directo
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fabian Emmes
testsuite
f
or c
v
s
c
o
-c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Lars Nosc
h
inski
cvsser
v
er: Add cvs co
-
c
support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Lars
Noschi
n
ski
c
vsserver: Add support for packed r
e
fs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fabia
n
Emmes
Testsuite:
U
nset CVS_
S
ER
V
E
R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
S
tepha
n
Beyer
L
i
nk git-she
l
l
only to a sub
s
et o
f
l
ib
g
it
.
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Haman
o
t
9
001 (send-email): D
o
not use hardcoded /bin
/
s
h
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hama
n
o
GIT 1
.
5
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Olivier Ma
r
in
buil
t
i
n-rm:
fix i
n
dex lo
c
k file path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C
H
a
m
ano
Mer
g
e branch 's
p
/
m
ain
t
-index-p
a
ck' in
t
o maint
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
http-
f
et
c
h: do not SE
G
V after fetching a bad pack idx
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
rev-li
s
t
:
honor --quiet option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Jun
i
o C Hamano
builtin-re
m
ote
.
c: fix earlier "skip_prefix
(
)
"
conv
e
rsio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Stephan Beyer
api-run-command
.
t
x
t: typ
o
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Pe
t
r Baudi
s
Documentation/RelNotes-
1
.
6
.
0
.
t
x
t: Expand
on the incompatible
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio
C
Hamano
rerere
.
au
t
oupda
t
e: change
the mes
s
a
ge w
h
en autoupdate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Ham
a
no
mailinfo: off-b
y
-one fix for [PATCH (foobar)] removal
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
read-cach
e
.
c
:
ty
p
ofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Update dr
a
ft
r
e
lease n
o
tes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Aver
y
Pennarun
R
eword "your b
r
an
c
h
h
as diverged
.
.
.
" lines to r
e
duce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Ham
a
n
o
M
e
rge
b
ranc
h
'mv
/
d
a
s
hless'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
a
m
a
n
o
M
e
rge branch '
l
s/ma
i
linfo'
commit
|
commitdiff
|
tree
2008-07-17
Petr Bau
d
is
D
ocume
n
tation/git-submodule
.
txt: Ad
d
Des
c
r
iption section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o C Hama
n
o
Merge br
a
n
c
h 'sb/d
a
shless'
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio C
H
amano
Merge branch 'rs/archive'
commit
|
commitdiff
|
tree
2008-07-17
J
uni
o
C
H
amano
Merge branch 'ag/
b
lame'
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
Hamano
M
e
r
g
e
b
r
anch '
r
s/rebase-checkout-not-so-quiet'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Ham
a
no
Merge
branch 'sp/maint-inde
x
-
p
ac
k
'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
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
Jo
h
annes Schindelin
g
it
fetch-pack: do not
c
omp
l
ain abou
t
"
n
o common commits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C
H
amano
Merg
e
branch 'js/ma
i
nt-pre
t
ty-mailmap' into maint
commit
|
commitdiff
|
tree
2008-07-16
Junio
C
Ha
m
ano
Merge branc
h
'sp/maint-bash-c
o
mpletion-op
t
i
m' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch 'sp/maint
-
pack-me
m
u
se' into maint
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Ham
a
n
o
Merge branch 'ls/maint-ma
i
linfo-patch-label' into main
t
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Hamano
Merg
e
b
r
anch '
j
s
/
main
t
-
d
aemon-syslog' into mai
n
t
commit
|
commitdiff
|
tree
2008-07-16
S
t
e
p
ha
n
Beye
r
rebas
e
-i: ke
e
p
o
l
d
p
a
r
en
t
s when p
r
es
e
rving
me
r
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
J
o
h
a
n
n
es Sixt
t7600-merge:
Use
test_e
x
pect_fai
l
u
re to t
e
st option
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Po
t
a
pov
Fix bu
f
fer
o
verflow in prepare
_
attr_stack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
D
m
itr
y
Pota
p
ov
Fix buffer
overfl
o
w in git
diff
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
-
g
r
ep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
SungHy
u
n Nam
t/M
a
kefile: use specified shell w
h
en running aggregat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Lars Noschin
s
ki
git-cvsserver: fix c
a
ll to non
e
xi
s
tant cl
e
anupWorkDir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shi
r
aishi
parse-options
.
c: make ch
e
ck_typos()
s
t
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
N
anako Sh
i
r
aishi
builtin-describe
.
c: make
a
global
v
ariable "pa
t
tern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nana
k
o Shiraishi
c
ache-tree
.
c: make ca
c
he_tree_find() static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Petr
B
aud
i
s
Documentation/git-cherry-pick
.
txt et al
.
: F
i
x m
i
sl
e
a
ding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
t/aggregate-results: white
s
pace fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Eri
c
Wong
t/lib-g
i
t-svn: fix SVN_H
T
T
P
D
tests to work wit
h
"trash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio
C Hama
n
o
Mer
g
e branch
'mv/merge-in-c'
commit
|
commitdiff
|
tree
2008-07-16
Junio
C Hamano
Me
r
ge
b
ranch 'ag/rew
r
ite_one'
commit
|
commitdiff
|
tree
2008-07-16
Junio
C Haman
o
M
e
rge br
a
nch
'sp/win'
commit
|
commitdiff
|
tree
2008-07-16
Junio C H
a
mano
M
e
r
ge branch 'js/mor
e
-win'
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
io C H
a
m
a
n
o
M
e
r
ge b
r
a
nch 'js/main
t
-pretty-mailmap'
commit
|
commitdiff
|
tree
2008-07-16
Johan
n
e
s
S
chindelin
Renam
e
"
.
dotest/
"
t
o
"
.
git/re
b
ase" a
n
d "
.
dotest
-
mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
A
lexa
n
der Gavrilov
Do not t
r
y to detect m
o
v
e/copy for entries
belo
w
threshol
d
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Alex
a
n
d
er G
a
vrilov
A
void rescanni
n
g
unchanged entries in search for c
o
p
ies
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
J
u
nio C Hamano
U
p
d
ate d
r
aft release no
t
es to 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next