repo.or.cz
/
git
/
ericb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
cherry-pick: add tests for new --ff option
2010-03-07
Ch
r
istian Cou
d
er
cherr
y
-pick:
a
dd tests fo
r
n
ew -
-
ff
optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Haman
o
revert:
add -
-
ff option
to allow fast forward
w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
b
u
iltin/merge:
make check
o
ut_fast_forward() non static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
pa
r
se-options: add pars
e
_opti
o
ns_concat()
t
o conca
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
J
unio C Hama
n
o
Merg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
U
p
d
ate draf
t
release note
s
to 1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
J
unio C Hamano
Merge branch 'jn/gitweb-co
n
f
i
g
-error-
d
ie' into maint
commit
|
commitdiff
|
tree
2010-03-05
Jun
i
o C H
a
mano
Merge
branch 'jn/maint-fix-pager' into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C
Ham
a
no
Merge branch 'tr/maint-cher
r
y
-pick
-
li
s
t
' into maint
commit
|
commitdiff
|
tree
2010-03-05
Ju
n
io C Hamano
M
er
g
e branch 'ld/ma
i
nt-diff
-
q
uiet-w' into
m
aint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Haman
o
Merge bra
n
ch 'rs/
o
pti
m
-text-wrap' into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hama
n
o
M
e
rge bran
c
h 'dp/read-not-mmap
-
smal
l
-loose-obje
c
t'
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Mer
g
e branch
'np/compres
s
-loose-object-memsave' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
J
u
nio C Hama
n
o
Merge
branch
'
jc/main
t
-status-preload' int
o
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge branch 'gf/maint
-
sh-s
e
t
u
p-nongit-ok' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Mer
g
e branch 'cc
/
maint-bisect-p
a
t
hs'
i
nto main
t
commit
|
commitdiff
|
tree
2010-03-05
Junio C H
a
m
ano
M
erge
b
r
anch
'm
a
i
nt-1
.
6
.
6
' in
t
o
maint
commit
|
commitdiff
|
tree
2010-03-05
Ju
n
i
o C Hama
n
o
Merge
b
ran
c
h 'm
a
in
t
-1
.
6
.
5' into
maint-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-05
Mic
h
al S
o
j
k
a
Remove extra '-' from git-
a
m(1
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Jun
i
o C Hamano
Merge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
io C Hamano
M
erge branch '
j
h/mai
n
t-submodule-st
a
tus-in-vo
i
d'
(
early
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Jeff K
i
n
g
submod
u
le summary
:
d
o not shift a
non-existent
positional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
J
unio C Hamano
Start prep
a
ring f
o
r 1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Junio
C
Ha
m
a
no
M
e
r
ge
b
ranch 't
c
/maint
-
transport-ls-rem
o
te-w
i
th
-
v
oid
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
J
u
nio C Ha
m
ano
Merg
e
br
a
nch 'hm/maint
-
imap
-
se
n
d-
c
rlf'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Merge
b
r
anc
h
'
s
p/main
t
-
p
ush-sideba
n
d'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2010-03-03
Juni
o
C Haman
o
M
erge branch 'j
c
/maint
-
fix-test-p
e
rm' into maint
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hama
n
o
Mer
g
e br
a
nch 'np/fast
-
impo
r
t
-
i
dx-v2
'
into mai
n
t
commit
|
commitdiff
|
tree
2010-03-02
J
unio C H
a
mano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-03-02
J
u
ni
o
C Ham
a
no
Merge
br
a
nch
'j
n
/
m
ai
n
t-fix-pag
e
r'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o C Hamano
M
e
r
g
e
branch
'
ml/encode-header
-
ref
a
c
t
or'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge
b
r
a
n
c
h '
j
n/gitweb-
c
onfig-error-die
'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o C Hamano
Merge b
r
an
c
h
'jc/for-each-ref'
commit
|
commitdiff
|
tree
2010-03-02
J
unio
C
H
a
m
ano
Merge
b
r
anch 'ld
/
maint-
d
iff-quiet-w'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Me
r
ge branch '
t
r/maint-cherry-pi
c
k-lis
t
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
e
r
ge branch 'rs/o
p
tim-te
x
t
-
wrap
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
e
rge branch 'ml/s
e
nd-pack-transport-refactor'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o
C
Hama
n
o
Merge branch 'ml/fill-mm
-
refac
t
o
r
'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio C
H
a
mano
M
erge branch 'ml/con
n
e
ct-refa
c
to
r
'
commit
|
commitdiff
|
tree
2010-03-02
J
u
n
i
o C Hamano
Merge branch 'n
p
/c
o
mpress
-
loose-
o
bject-mems
a
ve'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge bran
c
h '
d
p/read-not-
m
map-small-
l
oose-obje
c
t'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hama
n
o
Mer
g
e branch 'jn/makedep
e
nd'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o
C
H
a
mano
Merg
e
branch 'jc
/
maint-st
a
tus-preload'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge br
a
nch 'gf/main
t
-sh-setup-n
o
ngit-ok'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C Hamano
M
e
r
ge
branch 'jh
/
maint-submo
d
ule-st
a
tus-in-voi
d
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge branch 'hm/imap-send-
c
r
a
m-md5'
commit
|
commitdiff
|
tree
2010-03-02
Ju
n
i
o
C Hamano
Merge b
r
anch 'ml/color-when'
commit
|
commitdiff
|
tree
2010-03-02
J
unio C Ham
a
no
M
e
r
ge branch '
a
c/c
v
s
import-revision-mapping'
commit
|
commitdiff
|
tree
2010-03-02
Juni
o
C Hamano
Merge b
r
a
n
ch 'jc/grep
-
a
u
thor-all-match-im
p
li
c
it'
commit
|
commitdiff
|
tree
2010-03-02
Frank Li
f
allback SSH_ASKPASS w
h
en GIT
_
ASKPASS not set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Jakub N
a
r
e
bski
gitweb: Fix project-spe
c
ific feature override
behavi
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
S
y
lvain Rabot
gitweb multipl
e
projec
t
roots doc
u
mentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-01
Junio C Hamano
Mer
g
e branch '
c
c/m
a
int-
b
ise
c
t-p
a
ths
'
commit
|
commitdiff
|
tree
2010-03-01
Ch
r
i
s
tian Coude
r
bisect
:
error ou
t
w
h
en pass
i
ng bad path param
e
ters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Junio C Hamano
M
e
rge
branch '
m
aint'
commit
|
commitdiff
|
tree
2010-02-28
Ju
n
io C H
a
m
ano
Git 1
.
7
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Mark Lodato
Remove reference to G
R
EP_COLORS from docum
e
n
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan Nieder
Makefile: cl
a
rify
defi
n
ition
o
f TEST_OBJS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Markus Heidelberg
sha
1
_n
a
me: fix
segfault cau
s
ed by invalid index access
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-26
Junio C Hamano
Merge b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2010-02-26
Ju
n
io C Hamano
Merge branch 'mai
n
t-1
.
6
.
6' in
t
o
maint
commit
|
commitdiff
|
tree
2010-02-25
Johannes Sixt
W
indows: redir
e
ct f[re
]
op
e
n("/dev/null") to f[re]open
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-25
J
o
hannes Si
x
t
t3301-notes: insert a s
h
bang line in
.
/
fake_editor
.
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-24
Ju
n
io C
Hamano
Merge
br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-02-24
M
at
t
Kraai
commit: quote
t
he user name in t
h
e
exam
p
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-24
Junio C H
a
m
a
no
Mer
g
e branch 'ml/maint-g
r
ep-doc' into
m
aint
commit
|
commitdiff
|
tree
2010-02-23
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-23
Jonathan Nieder
am:
r
em
o
ve
r
ebase
-
a
pply di
r
e
c
tory bef
o
r
e
gc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert Wesa
r
g
rerere:
f
ix memo
r
y leak if rerere images can't be read
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-23
B
ert Wesarg
D
o
cumen
t
ation
:
m
ention conflict marker size
argum
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-23
Nicolas Pitre
move encode
_
in_pack_
o
bject
_
h
e
ader(
)
t
o
a better pla
c
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-22
J
onathan
Nied
e
r
tests: Fix race conditi
o
n in
t
7006-pager
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-22
Nicolas Pi
t
re
sha1
_
fil
e
:
be paranoid wh
e
n creatin
g
loose object
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-22
La
r
ry
D
'Anna
git-
d
iff:
a
d
d
a
test
f
or git diff --quiet -w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-21
Junio C Ha
m
ano
Merge
branch 'm
l
/maint-gr
e
p
-
doc'
commit
|
commitdiff
|
tree
2010-02-21
Junio C
Hamano
M
erge bra
n
ch
'
tc/maint-t
r
a
n
sport
-
l
s
-
remote-
w
ith-
v
o
i
d'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Hamano
Me
r
ge bran
c
h 'hm/maint-
i
map-se
n
d-crlf'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Hamano
Merge branch 'sp/push-sideban
d
'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Hamano
Me
r
ge branch 'jc/checko
u
t-detach
e
d'
commit
|
commitdiff
|
tree
2010-02-21
Junio
C Hamano
Merge branch
'
jc/main
t
-fix-test-p
e
r
m'
commit
|
commitdiff
|
tree
2010-02-21
Junio C H
a
mano
Merge branch 'jn/makefi
l
e-s
c
r
i
pt-lib'
commit
|
commitdiff
|
tree
2010-02-21
Ju
n
io C Hamano
Me
r
ge
b
r
anch 'mv/requ
e
st-p
u
ll
-
mo
d
ern
i
z
e
'
commit
|
commitdiff
|
tree
2010-02-21
Dmitry Potapov
has
h
-object:
don't use mmap() for small files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-21
Nicolas Pitre
sha1_file: do
n
't mall
o
c the whole compressed result
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan Nieder
t
7006-pager: i
f
s
tdout is no
t
a termina
l
, mak
e
a
new one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-20
Th
o
mas
R
ast
cherry_pic
k
_list: quit early if one side
i
s
e
mpty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Jonathan N
i
eder
tes
t
s
:
Ad
d
t
ests f
o
r
aut
o
matic
use of pag
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
René
Scharfe
utf8
.
c:
s
p
eculatively assume utf-8 in strbuf_a
d
d_wrapped_text()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
René Schar
f
e
utf8
.
c: remove strbu
f
_
w
r
ite()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
René Scharfe
utf8
.
c:
remove print
_
spaces()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
R
ené Scharfe
utf8
.
c: rem
o
ve
p
r
int_wrapped_text(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Eva
n
Po
w
ers
git-p4: fix
bug i
n
symlink handl
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Thomas Rast
t1450: fix t
e
stcases that were
w
rongly
e
xpecti
n
g failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Ja
c
ob Helw
i
g
Documentation: F
i
x
i
n
dentation
p
roblem in g
i
t-com
m
i
t(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-19
Junio C
Hama
n
o
M
erg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-02-19
Jun
i
o C
H
aman
o
Merge br
a
nch 'j
k
/m
a
int
-
r
m
di
r
-fix' into maint
commit
|
commitdiff
|
tree
2010-02-19
Je
f
f
King
rm: fix bug
in recursive
subdir
e
c
t
o
r
y removal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-19
Mark Lodato
A
d
d an
o
ptional argume
n
t
f
or --col
o
r options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-19
Stephen Boyd
Doc
u
mentation: describe --t
h
i
n
more ac
c
urately
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next