repo.or.cz
/
git
/
git-bigfiles.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a second testcase for handling invalid strategies in git-merge
2008-07-22
Pierre Habouzit
builti
n
-merge:
add miss
i
ng structure
initialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give
a
prop
e
r error message f
o
r
i
n
valid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
J
u
nio C Ha
m
ano
tests: do not rely on ex
t
er
n
a
l
"pa
t
ch"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Nik
o
laj Schuma
c
h
e
r
Don't cut off last ch
a
racter of commit descriptions
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
parse-options:
fi
x
segmentati
o
n
f
a
u
lt when a required
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Philippe Bruhat
.
.
.
mailinfo:
b
ett
e
r parse email adresses contai
n
g par
e
nt
h
eses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivie
r
M
a
ri
n
git-am: remove da
s
h from
h
elp message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Hamano
Revert "make git-s
t
atus use a pager"
commit
|
commitdiff
|
tree
2008-07-22
Jonathan Nieder
g
it-diff(1): "--c" -> "--cc" typo fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Johannes Schindelin
Renam
e
p
a
th_list to string_lis
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Johan
n
es Schindelin
Rename
.
git/rebase to
.
git/rebase-apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C Hamano
Up
d
ate
my e
-
mail address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
ama
n
o
Merge branch 'ap/trackinfo'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Merge branch 'jc/rerer
e
-auto-more'
commit
|
commitdiff
|
tree
2008-07-21
Jun
i
o C
Hamano
Merge bran
c
h '
n
s/am-ab
o
rt'
commit
|
commitdiff
|
tree
2008-07-21
Junio C H
a
mano
Me
r
ge bra
n
ch '
j
c
/
add-addremove'
commit
|
commitdiff
|
tree
2008-07-21
Junio C
Ha
m
ano
"needs update" consider
e
d
harmful
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
J
u
nio C Haman
o
Move
r
ead_i
n
_full() and writ
e
_in_full()
to w
r
appe
r
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
J
u
n
i
o C Haman
o
Link
shell
with compat
layer functi
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Haman
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-07-20
Dmitry
P
otapov
git-svn
:
fix git svn info to work without a
r
gume
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Mi
c
h
ele Ballabio
bui
l
tin-push
.
c: Clean
u
p - use OPT_BIT() and
r
emove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Michele Ball
a
bio
bu
i
ltin-me
r
ge
.
c:
Fix
o
p
tio
n
parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Jona
t
han
Nieder
fix
usag
e
string fo
r
git
grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
M
i
k
los
V
ajna
Te
a
c
h
'git merge' that so
m
e m
e
rge st
r
ategi
e
s no longer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
L
ars Nosc
h
insk
i
cvsserver: Add tests
u
i
te f
o
r pa
c
ked
refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
refresh-index:
f
ix
b
itmask
a
s
signment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
u
ni
o
C Ha
m
ano
git-
a
dd --
a
ll: d
o
cumentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Juni
o
C Hamano
git-a
d
d --all: tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
git-add --al
l
:
a
d
d all files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio
C Ham
a
no
builtin-a
d
d
.
c: res
t
r
u
c
t
ure
th
e
code for
maintainability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio 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 Shiraish
i
git am --a
b
ort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-19
Alexander
Ga
v
r
i
l
ov
Suppo
r
t gitlinks in fast-import
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio
C
H
a
mano
.
ma
i
lmap
u
pdate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Petr Ba
u
dis
D
ocu
m
enta
t
ion/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: rem
o
ve unused heade
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
R
e
n
é Scharfe
archi
v
e: make zi
p
compr
e
ssion level i
n
depende
n
t from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudis
Documentat
i
on: How to ign
o
re local changes
in tr
a
ck
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Pe
t
r Baudis
Docum
e
n
tation/git-su
b
module
.
txt: Fu
r
ther clarify the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Peter Harris
Add ANS
I
c
o
ntrol co
d
e
e
mulation
for the Windows
c
o
n
sole
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Joha
n
nes Sixt
b
uiltin
-
c
lon
e
: rewrite
g
u
ess_dir_name()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Eric Raible
Teach l
o
okup_prog not to select directories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fab
i
an Emmes
testsuite f
o
r cvs co -c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Lars Noschinski
cvsserver: Add
c
vs co -c s
u
pp
o
rt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
L
a
rs Noschinsk
i
cvss
e
rv
e
r
:
Add suppo
r
t for pa
c
ked refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fabian
Em
m
es
T
estsuite: Unse
t
C
V
S
_SERVE
R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
S
t
ephan B
e
yer
Link git-shell
only to a subset of l
i
bgit
.
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
unio C
Hamano
t9001 (send-
e
m
a
i
l
): Do not use hardcoded /bi
n
/sh in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
un
i
o C Hamano
GIT 1
.
5
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Olivie
r
Marin
builtin-r
m
: fix index l
o
ck file path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
Merge b
r
anch 'sp/maint-index
-
pack' into
ma
i
n
t
commit
|
commitdiff
|
tree
2008-07-18
Junio C Haman
o
http-fetch: do not S
E
GV afte
r
fetching a bad pack idx
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
J
u
n
io
C Hamano
rev-list: honor --quiet option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
built
i
n-remote
.
c: fix earlier "skip_pr
e
fi
x
()"
convers
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
S
t
e
p
han Beyer
api-run-
c
ommand
.
t
xt:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Pet
r
Baud
i
s
Documentation/RelNo
t
es-
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
Jun
i
o C
H
amano
rerere
.
auto
u
pdate: change the
m
essage w
h
en a
u
toup
d
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Juni
o
C Hamano
ma
i
lin
f
o: off-by-one fix for [PATC
H
(foobar)] re
m
o
v
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
Hamano
r
e
ad-cache
.
c: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
amano
U
p
date draft release note
s
f
o
r
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Avery Pennarun
Reword "your
branch has diverged
.
.
.
" l
i
nes to reduce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Ha
m
ano
Me
r
ge
b
ra
n
c
h 'mv/dashless'
commit
|
commitdiff
|
tree
2008-07-17
Junio C H
a
m
a
n
o
Merge br
a
nch 'ls/mai
l
info'
commit
|
commitdiff
|
tree
2008-07-17
Petr Baudis
Documentation/git-
s
ubmodule
.
txt:
A
dd Description section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge branc
h
'sb/das
h
less
'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
M
e
rge
b
ranch 'rs/a
r
ch
i
v
e
'
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
Haman
o
Merge br
a
nch 'ag/blame'
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio
C Hamano
Merge branch 'rs/rebase-check
o
ut-not-so-quiet'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merg
e
branch
'
s
p
/ma
i
nt-inde
x
-p
a
ck'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hama
n
o
Merge branch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2008-07-16
J
unio
C Hamano
Start prepari
n
g
1
.
5
.
6
.
4 release
note
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Schindelin
git fe
t
c
h
-p
a
c
k
:
d
o not compla
i
n
a
bout
"
n
o co
m
mon commits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Haman
o
Merge branch 'js/
m
aint-pretty-mai
l
map'
i
nto maint
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
io C Ha
m
ano
Merge branch
'sp/maint-bash-completion-opt
i
m
' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge
branch
'
sp/main
t
-
pa
c
k-mem
u
se' in
t
o maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch 'ls/maint-mailinfo-
p
atch-label
'
into maint
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o
C Hamano
Merge branch 'js/main
t
-
d
aemon
-
syslog
'
into maint
commit
|
commitdiff
|
tree
2008-07-16
Stephan Be
y
er
rebase-i: keep old parents
when preserving merg
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Johan
n
es Sixt
t7600-merge: Use test_expect_failur
e
to test
option
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Potapov
Fix buff
e
r
overflow in pre
p
a
r
e_a
t
tr_stack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmi
t
ry
P
otapov
Fix
bu
f
f
e
r over
f
low
i
n git diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
D
mitry Potapov
Fix
buffer overflow in
git-g
r
ep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
SungHyun Nam
t/Ma
k
efile:
u
se specified
s
hell when runnin
g
aggregatio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
L
ars
N
oschinski
g
i
t-cvsserver: fix
call to
n
onexistant clean
u
pWorkDi
r
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shiraishi
p
a
rse-options
.
c: make check_
t
yp
o
s
() static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shira
i
sh
i
builtin-
d
escribe
.
c
: make a global variable "pattern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako
Shiraishi
ca
c
h
e
-tree
.
c: make
cache_tree
_
find()
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
P
e
tr Baudis
Docum
e
nta
t
ion/
g
it-cherry-
p
ick
.
txt et al
.
: Fix misle
a
din
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
J
u
ni
o
C
H
amano
t/aggr
e
g
ate-resu
l
ts: whitespace f
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Eri
c
Wo
n
g
t
/
lib-git-svn: fi
x
SVN_HTTPD
te
s
ts
t
o work
w
ith "
t
rash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Hamano
M
e
r
g
e
branch 'mv/merge-in-c'
commit
|
commitdiff
|
tree
2008-07-16
J
unio
C
Hamano
Merge branch 'ag/rewrite_o
n
e'
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o C Ha
m
an
o
Merge branch 'sp/
w
i
n
'
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
a
mano
Merge
b
ranch '
j
s/more-win'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge
b
r
a
nch 'js/
m
ai
n
t
-pretty
-
mailmap'
commit
|
commitdiff
|
tree
2008-07-16
Joh
a
nnes Sc
h
indelin
Rename "
.
dotest/" to
"
.
g
i
t/re
b
ase"
a
nd "
.
dote
s
t-merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Alexander
G
avrilov
D
o not try to detect move/copy for entries below threshold
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Alexander Gavri
l
o
v
A
void rescan
n
i
n
g unc
h
a
n
g
e
d entries
i
n search for cop
i
e
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next