repo.or.cz
/
git
/
kirr.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: describe new cherry-pick --ff option
2010-03-07
C
h
risti
a
n Couder
Do
c
umentation: descr
i
b
e
new cherry-
p
i
ck --ff option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Christian Cou
d
er
cherry-
p
ick:
a
dd tests for new --ff op
t
io
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
reve
r
t:
add --ff
o
p
t
ion to
allow
f
a
s
t
f
orwa
r
d when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
builtin/merge
:
mak
e
che
c
kout_fast_forward() non
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
p
ar
s
e-
o
p
t
i
o
ns: add p
a
rse_options_conca
t
() to concat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-05
J
uni
o
C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Up
d
a
te draft r
e
lease
notes to 1
.
7
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge branch 'jn/gitw
e
b-c
o
nfi
g
-error-die' int
o
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C
H
a
mano
Merge branch 'jn/m
a
int
-
f
i
x-pager'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-05
Junio
C
Hamano
Merge branc
h
'
t
r/maint-cherry-pick-list' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-05
Junio
C Hamano
Merge
b
r
a
n
ch
'
ld/maint-
d
iff-quiet-
w
' int
o
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
M
erge branch 'rs/opti
m
-text-wrap' into maint
commit
|
commitdiff
|
tree
2010-03-05
J
unio C Hamano
Merg
e
bra
n
c
h
'
dp/rea
d
-
n
ot
-
mmap-sma
l
l-loose-object'
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Juni
o
C
Hamano
M
erge branch 'np
/
compress-loose-obje
c
t-me
m
save
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio C Ha
m
ano
Merge
b
ranc
h
'jc/maint-sta
t
us-preload' into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merg
e
branc
h
'gf/ma
i
nt-
s
h-setup
-
nongit-ok' into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio
C
Hamano
Merg
e
branch 'cc/m
a
int-bisect-pa
t
hs' i
n
to main
t
commit
|
commitdiff
|
tree
2010-03-05
Jun
i
o
C Hamano
M
erg
e
branch 'maint-1
.
6
.
6
'
in
t
o maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merg
e
branch 'ma
i
nt-1
.
6
.
5
'
i
nto
maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-05
Michal
Soj
k
a
R
emo
v
e extra
'
-' from
git-am(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
J
u
n
i
o
C
Hama
n
o
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-03
J
u
nio C Hamano
Me
r
g
e branch
'jh/maint-submo
d
ule-stat
u
s-
i
n-
v
o
i
d' (early
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Jef
f
King
submo
d
ule su
m
ma
r
y: do not sh
i
f
t
a n
o
n-
e
xistent positio
n
a
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
io C Hamano
S
t
a
rt preparing for 1
.
7
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
Junio C Ham
a
no
Me
r
ge branch 't
c
/
maint-
t
ra
n
sport
-
ls-re
m
ote
-
with-void
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Junio C
H
amano
Merge branch 'hm/ma
i
nt-
i
m
a
p-send-crlf' int
o
main
t
commit
|
commitdiff
|
tree
2010-03-03
J
un
i
o
C Hamano
Mer
g
e
branch 'sp/mai
n
t-push-sideband
'
into maint
commit
|
commitdiff
|
tree
2010-03-03
Jun
i
o C Ha
m
ano
Merge
b
ranch 'jc/maint-fix-test
-
p
erm
'
into maint
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
io C
Hama
n
o
Me
r
ge branch 'np/fast
-
import-
i
dx-v2' into
m
a
int
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio
C
Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
erge bra
n
c
h
'jn/maint
-
fix-pag
e
r'
commit
|
commitdiff
|
tree
2010-03-02
Junio C H
a
mano
Mer
g
e
branch 'ml/encode-header-ref
a
ctor'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C
Ham
a
no
Merge branch 'jn/gi
t
web
-
config-error-die'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o C Hamano
Merge b
r
a
n
ch 'jc/for-eac
h
-ref'
commit
|
commitdiff
|
tree
2010-03-02
J
unio
C
H
a
mano
Merge bran
c
h
'l
d
/ma
i
nt-
d
iff-quiet
-
w'
commit
|
commitdiff
|
tree
2010-03-02
J
unio C Hamano
Mer
g
e branch 'tr/mai
n
t-cherry-pick-list'
commit
|
commitdiff
|
tree
2010-03-02
J
unio C H
a
m
ano
M
e
rge branch 'rs/optim-text
-
wrap'
commit
|
commitdiff
|
tree
2010-03-02
Junio C
Hamano
Mer
g
e
b
ran
c
h 'ml/send-pack-tr
a
nsport-r
e
factor'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C
Hamano
M
e
r
ge
bran
c
h 'ml/f
i
l
l
-mm-refactor
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C
H
amano
Merge bran
c
h 'm
l
/co
n
nect-ref
a
ctor'
commit
|
commitdiff
|
tree
2010-03-02
Ju
n
io
C Hamano
Me
r
ge
b
ranc
h
'np/compre
s
s-loose-
o
bject-memsave'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
e
rge bran
c
h
'
dp/re
a
d-not-mmap-smal
l
-lo
o
se-ob
j
ect'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hama
n
o
Me
r
ge branch 'jn/makedepend'
commit
|
commitdiff
|
tree
2010-03-02
Junio C
H
amano
Merge br
a
nch
'
jc
/
m
ain
t
-status-p
r
eload
'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o C Hamano
Me
r
ge branch 'gf/main
t
-sh
-
setup-nongit-ok'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
erge branch
'jh/maint-submodule-status-in-void'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Ha
m
ano
Merge branch
'h
m
/ima
p
-s
e
nd-c
r
am-md5'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o C
H
amano
Merge branc
h
'
m
l/color-when'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
erge br
a
nch 'a
c
/cvsimport-revision-mappin
g
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C H
a
mano
Merge br
a
nch 'jc/grep-
a
u
t
h
or
-
a
ll-match-implicit'
commit
|
commitdiff
|
tree
2010-03-02
F
r
ank
L
i
fal
l
back SSH_ASKPASS when GIT_A
S
KPASS n
o
t set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
J
akub Narebsk
i
git
w
eb: Fix proje
c
t
-
specif
i
c feature override
behavior
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Sylvain Rabot
gitwe
b
multip
l
e
proj
e
c
t
roots d
o
cumentatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-01
Juni
o
C Hamano
Merge branch 'cc
/
maint-bisect-p
a
t
h
s
'
commit
|
commitdiff
|
tree
2010-03-01
Christ
i
an
C
ouder
bisect:
e
rror
out when passing
ba
d
path parameters
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
Junio
C Haman
o
M
e
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-02-28
Junio C
H
ama
n
o
G
i
t 1
.
7
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
M
ark Lodato
R
e
move reference t
o
G
R
EP_COL
O
R
S
from docu
m
e
n
t
a
ti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
J
onat
h
an Nieder
Makefile
:
cla
r
if
y
definition
o
f TEST_OBJS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
Markus Heidelber
g
sha1_name: fi
x
segfau
l
t c
a
used by inv
a
lid index access
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-26
Junio C Hamano
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-02-26
Junio C Hama
n
o
M
e
rge
b
r
a
nch 'maint-
1
.
6
.
6' into ma
i
nt
commit
|
commitdiff
|
tree
2010-02-25
Johannes Sixt
Windows: re
d
i
r
ect
f
[r
e
]o
p
en("/d
e
v/nul
l
") to f[re]o
p
en
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-25
Johannes
Sixt
t3301-notes: insert a shban
g
line in
.
/fake_editor
.
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-24
Jun
i
o C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2010-02-24
Matt Kraai
com
m
i
t:
quote the user name in
the example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-24
Jun
i
o C Haman
o
Merge
b
ranch 'ml/maint-gr
e
p-doc
'
into m
a
in
t
commit
|
commitdiff
|
tree
2010-02-23
Junio C Hamano
M
e
rge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-02-23
J
onathan Nieder
am
:
r
e
move
r
ebase-apply
directory
before gc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-23
Bert We
s
arg
rere
r
e: fix memory leak if
r
erere im
a
ges can't be r
e
ad
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-23
Bert Wes
a
rg
Documentation: m
e
ntion conflict
m
a
rker size argument
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-23
Nicola
s
P
i
tre
m
o
ve en
c
ode_in_pack
_
object
_
h
ead
e
r() t
o
a bette
r
place
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-22
J
o
nathan Nieder
tests
:
Fix race
co
n
dition in t7
0
06-pager
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-22
N
i
c
olas Pitre
s
h
a1_fil
e
:
b
e p
a
ranoid
w
h
en cre
a
ting loose
obj
e
c
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-22
Larr
y
D'Ann
a
git-d
i
f
f: 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
Junio C
H
amano
Merge branch 'ml/maint
-
gr
e
p-doc'
commit
|
commitdiff
|
tree
2010-02-21
Junio
C
Ha
m
ano
M
e
r
ge bra
n
ch 'tc/maint-transport-ls-remote-
w
i
th-void'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Ham
a
no
Merge br
a
nch 'hm/
m
aint-imap-send-crl
f
'
commit
|
commitdiff
|
tree
2010-02-21
J
uni
o
C Haman
o
M
e
rge branch 'sp/push-side
b
and'
commit
|
commitdiff
|
tree
2010-02-21
Junio C
Haman
o
Merge branch 'jc/checkout-det
a
ched'
commit
|
commitdiff
|
tree
2010-02-21
J
u
nio C Hamano
Me
r
g
e
branch '
j
c
/
m
a
i
nt-fix-te
s
t-pe
r
m'
commit
|
commitdiff
|
tree
2010-02-21
Juni
o
C Haman
o
Merge branch 'jn/makefile-script-lib'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Hamano
Merge br
a
nch
'mv/request-pull-mod
e
rnize
'
commit
|
commitdiff
|
tree
2010-02-21
Dmitry
P
ota
p
ov
hash-object: don't use mmap(
)
f
o
r small fil
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-21
Nicolas Pitre
sha1_file: don
'
t m
a
lloc the wh
o
le comp
r
essed result
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-21
J
onathan Ni
e
d
e
r
t7006-p
a
ger
:
if st
d
o
u
t is not a te
r
mina
l
,
make a new
o
ne
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-02-20
Thoma
s
Ras
t
cherr
y
_
p
ic
k
_list: quit early if one
side i
s
empty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jon
a
than Nieder
tests: Add tests for autom
a
tic use of pager
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
René Scharfe
utf8
.
c
: spe
c
ulati
v
ely assume ut
f
-8 in strbu
f
_add_wrapped_t
e
xt()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
René Scharfe
utf8
.
c: r
e
m
ove strbuf_write()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
René Sch
a
r
f
e
utf8
.
c: remove
p
r
int_spaces()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
René S
c
harfe
utf8
.
c: rem
o
ve print_wr
a
pped_text()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
Evan Po
w
ers
g
it
-
p4:
f
ix b
u
g i
n
syml
i
nk handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
Thomas Rast
t1450:
fix te
s
tcase
s
that
w
ere
wrongly expecting fa
i
l
u
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jacob Helwig
Documentation: Fix indent
a
tion pro
b
lem in git
-
commi
t
(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-19
Jun
i
o
C
Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-02-19
Junio C Hamano
Merge
bran
c
h 'jk/maint-rmdir-fix' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2010-02-19
Jeff King
rm: fix bug in recursive subdirecto
r
y re
m
oval
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-19
M
ark Lodato
Add
an op
t
ional argument for --col
o
r options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next