repo.or.cz
/
git
/
git-svn.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
Chri
s
tian C
o
ud
e
r
cherr
y
-pi
c
k: add
tests fo
r
n
ew --
f
f option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C Ham
a
no
revert: add --ff option to allow fast forward whe
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
amano
builtin/merge:
m
ake checkou
t
_fast_forward()
non static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
p
a
rse-options: ad
d
pars
e
_options_concat() to
concat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
J
un
i
o C Ha
m
ano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-05
Junio C Ha
m
ano
Update d
r
a
f
t release no
t
e
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 br
a
nch 'jn/gitwe
b
-config-err
o
r-die' int
o
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Me
r
ge branc
h
'
jn/maint-
f
ix-pager' into main
t
commit
|
commitdiff
|
tree
2010-03-05
Jun
i
o C Hamano
Merge branch '
t
r/maint-cherry-pick-l
i
st' i
n
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2010-03-05
Jun
i
o C
H
amano
M
e
r
g
e b
r
a
n
ch 'ld
/
maint-diff-quiet-w' in
t
o m
a
int
commit
|
commitdiff
|
tree
2010-03-05
Junio C Ham
a
no
Merge bra
n
ch '
r
s/opti
m
-text-wrap' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge b
r
anch 'dp/read-no
t
-mm
a
p-small-loose-object'
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
J
u
n
i
o C Hamano
M
erge branch 'np/compress-loose-o
b
j
e
ct-mem
s
ave' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Jun
i
o C Hamano
Me
r
g
e bra
n
ch
'
j
c/maint-s
t
atus-preload' into maint
commit
|
commitdiff
|
tree
2010-03-05
J
unio C
Hama
n
o
Merge branch 'gf/maint-sh-setup-
n
o
ngi
t
-o
k
' into m
a
int
commit
|
commitdiff
|
tree
2010-03-05
Ju
n
io
C
H
amano
M
erge branc
h
'
c
c/
m
aint-bisect-
p
aths
'
into mai
n
t
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
M
e
rge branch '
m
aint-1
.
6
.
6' i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2010-03-05
Junio
C
Hamano
Merg
e
branch '
m
aint-1
.
6
.
5' into
m
aint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-05
Michal Sojka
Remove extr
a
'-' from git
-
am(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Merge branch 'jh/ma
i
nt
-
s
ubmodule-statu
s
-in-void' (e
a
r
ly
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Jeff King
sub
m
od
u
le s
u
mmary
:
d
o
n
ot shift a non
-
existent p
o
sitio
n
al
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
S
t
art pre
p
aring for 1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Merge branch 'tc/maint-transport-
l
s-
r
emote-with-void
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
M
erge
branch
'
h
m
/m
a
int-imap-send-crlf' into maint
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
io C Hamano
Merge
b
r
a
n
c
h
'
s
p/ma
i
n
t-push-sideband' into maint
commit
|
commitdiff
|
tree
2010-03-03
Junio C Ham
a
no
Merge branch 'jc/main
t
-fix-test-perm'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-03
Junio C H
a
ma
n
o
M
e
rge branch 'n
p
/fast-import-idx-v2' i
n
to m
a
i
nt
commit
|
commitdiff
|
tree
2010-03-02
Junio C
H
aman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merg
e
branch 'jn/m
a
i
nt
-
fix-p
a
ge
r
'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C Hamano
Merge branch 'm
l
/en
c
ode-
h
eade
r
-refactor'
commit
|
commitdiff
|
tree
2010-03-02
Ju
n
io C Hama
n
o
Merge
b
ranch 'jn/gitweb-config-error-di
e
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C H
a
mano
Merg
e
br
a
nch 'jc/for-ea
c
h-re
f
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Ha
m
ano
M
e
rge branc
h
'ld/maint-diff-quiet-w'
commit
|
commitdiff
|
tree
2010-03-02
Junio C
H
amano
Merge branch 'tr/maint-ch
e
rry-pick-list'
commit
|
commitdiff
|
tree
2010-03-02
Junio C H
a
mano
Merge branch 'rs
/
optim-text-wrap'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio
C
Hamano
M
e
rge branch 'ml/send-pack-tr
a
nsport-r
e
factor'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C Hamano
M
erg
e
b
ranch
'
m
l
/
fill-mm
-
refactor'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge branch 'ml
/
connect-refac
t
or'
commit
|
commitdiff
|
tree
2010-03-02
Juni
o
C
Hamano
Merge branch 'np/c
o
mpress-lo
o
se-obj
e
ct-me
m
save'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C Ha
m
a
no
Merge
bra
n
c
h
'dp/read-not-
m
map
-
sma
l
l-loose-object'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
erge br
a
nch 'jn/mak
e
depen
d
'
commit
|
commitdiff
|
tree
2010-03-02
J
unio C Ham
a
no
Merge branch 'jc/main
t
-sta
t
u
s
-preload'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio
C Hamano
Merg
e
branch '
g
f/main
t
-
s
h-setup-
n
ongit-ok'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Mer
g
e bran
c
h
'jh/maint-submodule-
s
tatus-in-void'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C
Hamano
Merge branch 'hm/i
m
ap-send
-
cr
a
m-md5'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C Ham
a
n
o
M
e
rge branch
'
ml/color-wh
e
n'
commit
|
commitdiff
|
tree
2010-03-02
J
unio C H
a
ma
n
o
Merge branch 'ac/cvsimport-r
e
vision-mapping'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Mer
g
e branch 'jc/grep
-
auth
o
r-all-mat
c
h
-
implici
t
'
commit
|
commitdiff
|
tree
2010-03-02
Fr
a
nk Li
fallback SSH_ASKPASS when GI
T
_ASKPASS not
s
et
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Jakub N
a
rebski
gitweb: F
i
x project-specific
feature overr
i
d
e
beh
a
vior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Sylvain
Rabot
gitweb multiple project root
s
document
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-01
Junio C Hamano
Merge bran
c
h 'cc/maint-bise
c
t
-paths'
commit
|
commitdiff
|
tree
2010-03-01
Christ
i
a
n C
o
uder
b
isect: error
out
wh
e
n passing
b
ad p
a
th
parameter
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Junio
C Ham
a
no
Me
r
ge
b
ra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-02-28
J
u
n
io C Ham
a
no
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 GREP_COLORS from docum
e
nt
a
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan Nieder
Makefile
:
cl
a
rify defin
i
tion of TEST_OBJ
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Markus Heidelberg
s
h
a1_na
m
e: fix
s
egfault
ca
u
sed by inva
l
id index ac
c
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-26
J
unio C Hamano
Merge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-02-26
J
unio C Hamano
M
e
rge
branch 'maint
-
1
.
6
.
6' i
n
to maint
commit
|
commitdiff
|
tree
2010-02-25
J
o
hannes Six
t
Wind
o
ws: redirect f[re]open("/dev/nul
l
") t
o
f[re]open
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-25
Johann
e
s
Sixt
t3301-notes:
i
n
s
e
r
t a shb
a
ng line i
n
.
/
f
a
ke
_
edit
o
r
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-24
Jun
i
o
C
Ham
a
n
o
Mer
g
e
branch
'maint'
commit
|
commitdiff
|
tree
2010-02-24
Ma
t
t Kraai
c
ommit:
q
u
ot
e
the user na
m
e i
n
t
he ex
a
m
ple
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-24
Junio C Hamano
Merge branc
h
'ml/maint
-
g
rep-doc'
into maint
commit
|
commitdiff
|
tree
2010-02-23
J
u
nio C Hamano
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2010-02-23
J
onathan N
i
eder
am: remove rebase-apply dir
e
ctory before gc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-23
Be
r
t Wesarg
rerere: fix m
e
m
ory leak if
rerere imag
e
s c
a
n't be read
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert Wesarg
Docu
m
e
ntation: mention conflict marker size ar
g
ument
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-23
N
icolas Pitr
e
move encode_in_pack
_
ob
j
ec
t
_
header() to a better place
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Nieder
tests: Fix
r
a
ce condition in t7006-pager
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-22
Nicolas Pitre
sha1_file: be p
a
ranoid when creating loose objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-22
Larry D'Anna
g
i
t-d
i
ff:
add a te
s
t
for git diff --quiet -w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-21
J
unio C Hamano
Merge branch 'ml/maint-grep-doc'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Haman
o
Merge bra
n
ch 't
c
/
m
aint-transport-ls-
r
emote
-
w
it
h
-void'
commit
|
commitdiff
|
tree
2010-02-21
Juni
o
C Hamano
Merge branch 'h
m
/ma
i
nt-imap-send-crlf'
commit
|
commitdiff
|
tree
2010-02-21
Junio C
H
amano
Merge br
a
n
ch 'sp/push-sideband'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Ham
a
n
o
Mer
g
e branch 'jc/checkout-
d
etached'
commit
|
commitdiff
|
tree
2010-02-21
J
unio C Ham
a
no
Mer
g
e
b
ranch 'j
c
/
m
aint-f
i
x-te
s
t-
p
e
rm'
commit
|
commitdiff
|
tree
2010-02-21
Junio
C
Ham
a
no
Merge b
r
anch
'
jn
/
m
akefile-s
c
ript-lib'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Hama
n
o
Merge bra
n
ch 'mv/
r
eq
u
est-
p
ull
-
moderniz
e
'
commit
|
commitdiff
|
tree
2010-02-21
Dmitry Po
t
apo
v
hash-object: don't us
e
mmap(
)
for smal
l
f
i
le
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-21
Nicolas Pitr
e
sha1_file: don't malloc
the whole
c
ompresse
d
result
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan Nieder
t7006-pager
:
if std
o
ut
is not a terminal, make
a
n
ew one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Junio C
H
a
m
a
no
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-20
Thomas Rast
cherry_pick_list: quit
ea
r
ly
if on
e
side is empty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Jo
n
atha
n
Nie
d
er
tests: Ad
d
tests
for
automati
c
use of pager
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
R
ené Sch
a
rfe
utf8
.
c: speculat
i
vely a
s
sume utf-8 in strbuf_add_w
r
a
p
ped_text()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
René Scharfe
utf8
.
c:
r
emov
e
strbuf_wri
t
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
René Scharfe
utf8
.
c: remo
v
e print_spaces()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
René
S
c
har
f
e
u
tf8
.
c
:
re
m
ove p
r
i
nt_wrapped_text()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
E
van
P
ow
e
rs
git-p4: fix b
u
g i
n
symlink handlin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
T
h
omas Ra
s
t
t1450:
fix testcases tha
t
we
r
e
w
r
o
ngly expecting f
a
ilure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Jacob Helwig
Doc
u
mentation: Fix
i
ndent
a
t
i
on problem in
g
it-c
o
mmit(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-19
Ju
n
i
o
C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-19
Junio C Ha
m
ano
Merge branch 'jk/mai
n
t-rmdir-fi
x
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2010-02-19
Jef
f
King
r
m: fix bug in
r
ecu
r
si
v
e subdirecto
r
y re
m
oval
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-19
Mark Lodato
Add an
o
ptiona
l
argume
n
t fo
r
--
c
olo
r
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-19
Stephen Bo
y
d
Documentatio
n
: describe --thin more accurately
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next