repo.or.cz
/
git
/
vmiklos.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7601: extend the 'merge picks up the best result' test
2008-07-23
M
i
k
los Vajna
t7601: extend the
'
merge pic
k
s
u
p the
b
est result'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Daniel Barkalow
In perforce, RCS keywords are case-sensitive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Alex Riesen
A
llow page
r
o
f
d
i
ff command be
e
nabled/disabled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Johannes Sch
i
ndelin
Fix two lefto
v
ers f
r
om path_l
i
st
-
>string_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
git am --sk
i
p:
cle
a
n the inde
x
while preserving local
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Pierre Habouz
i
t
g
i
t-su
b
module: move ill placed s
h
ift
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Pierre
H
ab
o
uzi
t
builtin-merg
e
: add
m
issin
g
structure initialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Mikl
o
s Va
j
na
bui
l
t
in-merge:
g
ive a proper
e
r
r
o
r me
s
sage for inval
i
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Hamano
t
e
s
ts: do
not rely on ext
e
rnal "patch"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Nikolaj S
c
hum
a
cher
Don'
t
cut o
f
f last character of com
m
it
d
e
scrip
t
io
n
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Oliv
i
er
M
arin
parse-options: f
i
x segmentation
f
ault
w
hen a require
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Philippe Bruhat
.
.
.
mailinfo: better pa
r
se
e
mail adre
s
ses containg
parenthe
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
git
-
am: re
m
o
v
e
dash from he
l
p message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
J
u
n
io
C
Ham
a
no
Revert "
m
ake gi
t
-status us
e
a pager"
commit
|
commitdiff
|
tree
2008-07-22
Jon
a
than
Niede
r
git-diff(1): "--c" -> "--c
c
" ty
p
o fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
J
ohannes Sc
h
inde
l
in
Renam
e
pat
h
_list to string_l
i
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Johannes Schindelin
Re
n
a
m
e
.
git/rebase to
.
git
/
reb
a
se-apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C H
a
mano
Updat
e
m
y
e-mail address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Me
r
ge
b
ranch 'ap/trackinfo'
commit
|
commitdiff
|
tree
2008-07-21
Junio
C
Hamano
Mer
g
e branch
'
jc/rerere-auto
-
more
'
commit
|
commitdiff
|
tree
2008-07-21
J
u
nio C
H
amano
M
erge branch 'ns/am-abort'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hama
n
o
Me
r
ge b
r
a
n
c
h 'jc/add-ad
d
remove'
commit
|
commitdiff
|
tree
2008-07-21
J
u
nio C Hamano
"
needs upd
a
te" consider
e
d harmfu
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
J
u
nio
C
Hamano
Move read_i
n
_full() an
d
w
r
it
e
_in_full() to
w
rapper
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C H
a
m
a
no
L
in
k
shell with compat
lay
e
r
f
un
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C Ha
m
ano
Merge branch
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2008-07-20
D
m
it
r
y Pot
a
pov
git-svn:
fix git s
v
n info to work without arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Michele Ball
a
bio
builtin
-
push
.
c: C
l
ea
n
up - use
O
PT_BIT() and remo
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Michele Ballabio
b
uiltin-merge
.
c:
F
ix option
p
arsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Jo
n
athan Nieder
fix usage string for g
i
t gr
e
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
V
ajna
Teach 'g
i
t
m
erge' t
h
at
some merge
s
t
r
ategies no longer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Lars No
s
chinski
cvsser
v
er: Add t
e
stsuite for
pack
e
d re
f
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
u
nio
C Hamano
re
f
resh
-
in
d
ex: fix bitmask assignmen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
unio C Hamano
git-a
d
d
-
-
all: docum
e
ntation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
un
i
o C Ha
m
a
no
g
it-add --
a
ll: test
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
git-add --all:
a
dd
all files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
b
u
iltin-add
.
c: restructure the co
d
e for
m
a
intainability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
unio C Hamano
Ge
t
ting closer to 1
.
6
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Nan
a
ko Shiraishi
git am
--abo
r
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
M
erge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-07-19
Alexander Gavrilov
Supp
o
r
t git
l
inks in
f
ast-impor
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
un
i
o C Ha
m
a
no
.
ma
i
lmap update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudis
Docume
n
tati
o
n/git-me
r
ge
.
t
x
t: Partial r
e
write
of Ho
w
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
R
e
né Sc
h
arfe
archive: remove unused headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Re
n
é Scha
r
fe
arch
i
v
e: ma
k
e
z
ip compress
i
o
n level independ
e
nt
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
P
e
t
r
Baudi
s
Documentation
:
Ho
w
to ignore local cha
n
ges in track
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Petr
Baudis
D
ocument
a
tion/git-su
b
modul
e
.
txt: Further clarify t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Peter H
a
rris
Add ANSI cont
r
o
l
code emulatio
n
for
the Windows cons
o
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Joh
a
n
n
es Sixt
builtin-clone: rewrite guess_dir_name(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Eric Raibl
e
Teach
lookup_prog n
o
t to sel
e
ct
d
irectories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
F
a
bia
n
Emm
e
s
test
s
uite for cvs co -c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Lar
s
Noschin
s
ki
cvsserve
r
:
A
dd
c
vs co
-
c su
p
p
o
rt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Lars
N
o
s
chi
n
ski
cvsserver: Add suppor
t
for packed refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fabian Em
m
es
Testsuit
e
: Unset CVS_S
E
RVER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Stepha
n
Beyer
Link git-shell on
l
y
t
o a
su
b
s
et
o
f
l
ibgit
.
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
unio C Hamano
t9001 (send-ema
i
l): Do not
use hardcoded /b
i
n
/
s
h
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
u
nio C Ha
m
ano
GIT 1
.
5
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Olivier Marin
bu
i
ltin-rm: fix index lock file pa
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio
C Hama
n
o
Merge branch 's
p
/
maint-index
-
pack' into maint
commit
|
commitdiff
|
tree
2008-07-18
Junio C Ham
a
no
http-f
e
tch: do not SEGV af
t
er f
e
tching a bad pack i
d
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Ju
n
io
C
H
amano
rev-l
i
st
:
honor -
-
quiet optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C H
a
mano
bui
l
tin-remote
.
c
: fix earlier
"skip_prefix()" conv
e
rsion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
St
e
ph
a
n
B
e
ye
r
api-
r
un-com
m
and
.
txt: t
y
pofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Petr Baudis
Document
a
t
ion/
R
e
l
Notes-1
.
6
.
0
.
txt: Expand on the incomp
a
tible
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C
Hamano
r
e
rere
.
au
t
o
update: change the message when aut
o
u
pda
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Ju
n
i
o C Hamano
mailinfo: off-b
y
-one
f
i
x
for
[
PATCH
(foobar)]
r
e
mova
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Haman
o
read-cache
.
c
:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
amano
Update draf
t
r
e
lease notes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Avery P
e
nnarun
Reword "your
b
ranch
has diverged
.
.
.
" lines to re
d
uce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Juni
o
C Hama
n
o
Merge
branch 'mv/da
s
hl
e
ss'
commit
|
commitdiff
|
tree
2008-07-17
Ju
n
io C Hamano
Merge bran
c
h
'
ls/mai
l
inf
o
'
commit
|
commitdiff
|
tree
2008-07-17
Petr
B
audis
Documentati
o
n
/
git-submodule
.
txt: Add Des
c
ription s
e
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
Hamano
M
e
rge
branch 'sb/da
s
hless'
commit
|
commitdiff
|
tree
2008-07-17
Juni
o
C Hamano
Merge branch 'rs/archi
v
e'
commit
|
commitdiff
|
tree
2008-07-17
Ju
n
i
o C
H
amano
M
e
r
ge branch 'ag/blame'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
M
erge branch 'rs/
r
e
b
ase-checkout-not-so-quiet'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge
b
ranch 'sp/m
a
i
nt-
i
ndex-pack'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge bran
c
h
'main
t
'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Ham
a
no
S
t
art preparing
1
.
5
.
6
.
4
release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Joha
n
nes Schind
e
lin
g
i
t fetch-pack: d
o
not
complain about "n
o
comm
o
n commits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
io C Hamano
Merge branch
'
js/maint-pre
t
ty-m
a
ilmap' into maint
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Hamano
Me
r
ge branch 'sp/m
a
i
n
t-bash
-
comp
l
etion-optim' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio C Ha
m
ano
Merge bra
n
ch 'sp/m
a
int-pack-memus
e
'
into maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
M
e
r
ge branch 'ls/maint-mailinfo-patch-label'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
io C
H
amano
M
e
rge branch 'js/maint
-
d
a
e
mon-
s
yslo
g
' into mai
n
t
commit
|
commitdiff
|
tree
2008-07-16
Stephan Beyer
re
b
a
s
e-i: keep old parents
when
preserving merge
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Sixt
t7600-
m
erge: Use test_expec
t
_
f
ailure to test option
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
D
mitry Pota
p
ov
F
ix buffe
r
overflow in prepare_at
t
r
_
st
a
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Po
t
apov
Fix buff
e
r overflow in git diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitr
y
P
ota
p
ov
Fix buffer o
v
e
r
flo
w
i
n git-grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
SungHyu
n
Nam
t/Makefile
:
use s
p
ecified shel
l
w
hen r
u
nning aggregat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Lars No
s
ch
i
nsk
i
gi
t
-cvsserver: fi
x
call to nonex
i
s
tant clean
u
p
WorkDi
r
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako
S
h
i
raishi
p
a
rse-opti
o
n
s
.
c
:
m
ak
e
check_typos() stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shi
r
aishi
builtin-describ
e
.
c: make
a global
v
aria
b
l
e "pat
t
ern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Na
n
ako
Shirai
s
hi
ca
c
he-tree
.
c: ma
k
e
c
ach
e
_tre
e
_
find()
s
tat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
P
e
t
r
Ba
u
dis
Do
c
um
e
n
tation/git-che
r
ry-pick
.
t
xt
et al
.
: Fix
misleading
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o C Hamano
t
/aggre
g
ate
-
results: whitespace fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Eric Wo
n
g
t
/
l
ib-git-
s
v
n
:
fix SVN_HTTPD tests to work with "tras
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o C Hamano
Merge branch
'
mv
/
merge-in-
c
'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio
C
Hamano
Merge
bra
n
c
h
'a
g
/rewr
i
te
_
one'
commit
|
commitdiff
|
tree
next