repo.or.cz
/
git
/
dkf.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
ri
s
tian Co
u
d
e
r
Docu
m
entation: d
e
sc
r
i
b
e new che
r
ry-pick --
f
f optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
C
hristian Couder
cherry-pick: add tests for new
--ff
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
r
e
vert: add --ff option to allow fa
s
t fo
r
ward when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
mano
builtin/merge: make checkout_fast_forward() non sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
J
unio
C
Hamano
par
s
e-options: add parse_options
_
concat
(
) to concat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge bran
c
h '
m
a
i
n
t'
commit
|
commitdiff
|
tree
2010-03-05
Juni
o
C
Ha
m
an
o
U
pdate dr
a
ft releas
e
n
otes t
o
1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
Ju
n
io C Ha
m
a
n
o
M
erge branch 'jn/g
i
tweb-config-error-die' into mai
n
t
commit
|
commitdiff
|
tree
2010-03-05
Junio C H
a
mano
M
e
rge branch
'jn/
m
ai
n
t-fix-pager' into maint
commit
|
commitdiff
|
tree
2010-03-05
J
u
nio
C
Ha
m
ano
M
e
rge bran
c
h 'tr/m
a
int-
c
herry
-
pick-list' into main
t
commit
|
commitdiff
|
tree
2010-03-05
Jun
i
o C
H
aman
o
M
erge bran
c
h 'l
d
/m
a
int-diff-quiet
-
w'
i
nt
o
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C
H
ama
n
o
Merge branch 'rs/optim-text-w
r
a
p
' into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge branch 'd
p
/
read-not-mm
a
p-small-lo
o
se-object
'
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
J
u
ni
o
C
H
amano
Merge branc
h
'np/c
o
mpress-loose-object-
m
emsave' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
M
e
r
ge branch
'
jc
/
maint-sta
t
us-preload' int
o
maint
commit
|
commitdiff
|
tree
2010-03-05
J
unio C
H
amano
Merge
b
ranch
'
gf/ma
i
nt-s
h
-setup-nongit-ok' into maint
commit
|
commitdiff
|
tree
2010-03-05
J
u
nio C Hamano
Merge
b
ran
c
h 'cc/
m
aint-b
i
sect-paths' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-05
J
u
nio C Haman
o
Merge
b
ranch 'mai
n
t-1
.
6
.
6'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge branch '
m
ai
n
t
-1
.
6
.
5' in
t
o maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-05
Mi
c
hal So
j
ka
Remove extra '-' from git
-
am
(
1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
M
e
rg
e
br
a
nch
'
m
a
i
n
t'
commit
|
commitdiff
|
tree
2010-03-03
J
u
nio C Hamano
M
e
rge b
r
anch 'jh/maint-
s
ub
m
odule-stat
u
s-i
n
-void' (ear
l
y
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Jeff King
submodule
s
u
mma
r
y
:
do
not shi
f
t a non-exi
s
tent positional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Star
t
prepar
i
ng
f
or 1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Junio
C Haman
o
Merge
b
ranch 'tc/
m
ai
n
t-tr
a
nsport-
l
s-r
e
mot
e
-
with
-
void
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Junio
C
Hamano
M
e
rge b
r
anch 'hm/maint-ima
p
-send-crlf'
in
t
o
ma
i
n
t
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Merge branch
'sp/maint
-
push-
s
ideb
a
n
d'
i
n
to maint
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
i
o
C
H
am
a
no
M
erge branch 'jc/maint-
f
ix-test-perm' into maint
commit
|
commitdiff
|
tree
2010-03-03
J
u
nio C Haman
o
M
erge bra
n
c
h 'np/fa
s
t
-import-idx-v2' into maint
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o
C Hamano
Merge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C Hamano
Merge
b
ran
c
h 'j
n
/maint-fix-page
r
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hama
n
o
Merge
branch 'ml/encode-header-refac
t
or'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C
H
a
mano
Merge bran
c
h 'jn/gitweb-conf
i
g-er
r
or-d
i
e'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C
Hamano
Merge branch
'jc/for-e
a
c
h-ref'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o C Hama
n
o
Merge branch '
l
d
/
maint-diff-quiet-w'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Ha
m
an
o
Merge
b
ra
n
ch
'
tr/
m
aint-c
h
erry-pick-list'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C Hamano
Merge branch 'rs
/
optim-text
-
w
r
ap'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o C Hamano
Me
r
ge b
r
anch '
m
l/send-
p
ack-t
r
a
n
sp
o
rt-r
e
f
a
ctor
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C
Hama
n
o
Merge br
a
nch 'ml/fill
-
mm-re
f
actor'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o C Hamano
Merg
e
bran
c
h 'ml/connect-re
f
a
ctor'
commit
|
commitdiff
|
tree
2010-03-02
Junio C H
a
mano
Mer
g
e branch 'np/compress-loose-object-memsa
v
e'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge branch
'
d
p/read-no
t
-
m
map-s
m
all-loose-ob
j
ec
t
'
commit
|
commitdiff
|
tree
2010-03-02
J
unio C Hamano
Merge branch
'
jn/makedepen
d
'
commit
|
commitdiff
|
tree
2010-03-02
J
unio C Hama
n
o
M
erg
e
branch 'jc/maint-status-pr
e
load'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Mer
g
e
branch 'gf/m
a
i
nt-sh-setup-n
o
ngit-ok'
commit
|
commitdiff
|
tree
2010-03-02
J
u
n
io
C Hamano
Mer
g
e branc
h
'jh/mai
n
t-sub
m
odule
-
st
a
tus-in-void'
commit
|
commitdiff
|
tree
2010-03-02
Junio C
H
am
a
no
M
e
rge
branch 'hm/i
m
ap-send-cram-md5'
commit
|
commitdiff
|
tree
2010-03-02
Juni
o
C Hamano
Merge branch 'ml/co
l
or-when'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C
H
aman
o
Merge branch 'ac/cvsimport-revision-m
a
pping'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge b
r
anch 'jc/
g
rep-author-all
-
mat
c
h-implicit'
commit
|
commitdiff
|
tree
2010-03-02
Frank
L
i
fallback
S
S
H
_A
S
KPASS when GIT_ASKPASS not set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Jakub Narebs
k
i
gitweb: Fix project-specific feature
o
ve
r
ride behavior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Sy
l
vain Rabot
gitweb multiple project roots documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-01
Ju
n
io C H
a
m
a
n
o
Mer
g
e branch
'
cc/maint-bisect-paths'
commit
|
commitdiff
|
tree
2010-03-01
Christian Couder
b
i
sect: error out when passing
b
ad p
a
th parameters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Junio C Hamano
Merge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2010-02-28
J
unio C Ham
a
no
G
it 1
.
7
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Mark Lodato
Remo
v
e reference to GREP_C
O
LORS
f
rom docu
m
entatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan Niede
r
Makefile: clari
f
y
definition of
T
EST_OBJS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Ma
r
kus H
e
idelberg
sha1_
n
ame:
f
ix
segfault ca
u
sed by invali
d
index acce
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-26
J
unio C Hamano
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2010-02-26
Junio C
Haman
o
Merg
e
branch
'
maint-1
.
6
.
6' into
m
aint
commit
|
commitdiff
|
tree
2010-02-25
Johannes
Six
t
Wi
n
dows
:
red
i
r
ect f[
r
e]open(
"
/dev/null") to f[re]ope
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-25
Johan
n
es
S
ixt
t3301-notes: inser
t
a shb
a
ng line in
.
/
f
a
k
e
_ed
i
tor
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-24
Junio C Ham
a
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-24
Matt Kraai
co
m
mit: q
u
ote the us
e
r
name in the example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-24
Junio C Ha
m
ano
Merge b
r
anc
h
'ml/maint-grep-doc' into maint
commit
|
commitdiff
|
tree
2010-02-23
Junio
C
H
am
a
no
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2010-02-23
J
o
nath
a
n Ni
e
der
a
m: rem
o
v
e reba
s
e-apply
directory
b
e
fore gc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-23
B
ert Wesarg
rerere: fix me
m
ory
l
ea
k
if rerere images c
a
n't be read
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert
Wesarg
Documentation: mention c
o
nflict marker size argument
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-23
Nicolas P
i
tre
move enc
o
de_i
n
_
p
a
ck_obj
e
ct_h
e
a
d
er() to a
b
etter pl
a
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Nieder
tests: Fix race condition in
t
7006-
p
a
ge
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-22
Ni
c
o
l
as Pitre
sha1_file: be paranoid
w
hen
c
reatin
g
loose objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-22
Larry D'Anna
git-diff: a
d
d a tes
t
for
git diff --q
u
i
e
t -w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-21
Jun
i
o C Hama
n
o
Mer
g
e branch 'ml/maint-gre
p
-
doc'
commit
|
commitdiff
|
tree
2010-02-21
Ju
n
io C Hamano
Merge branch 'tc/main
t
-
transport-ls
-
remote-
w
ith
-
void'
commit
|
commitdiff
|
tree
2010-02-21
Junio
C Hamano
Merge branch 'hm/maint-imap-send-crlf'
commit
|
commitdiff
|
tree
2010-02-21
J
un
i
o C Hamano
Merge bran
c
h 'sp/
p
us
h
-sideband'
commit
|
commitdiff
|
tree
2010-02-21
Junio C
Hamano
Merge
branch 'jc/checkout-detache
d
'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Ha
m
ano
Merge branch 'jc/
m
aint-
f
ix
-
test-perm'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Hamano
Merge branch '
j
n
/
mak
e
f
i
le-script-
l
i
b'
commit
|
commitdiff
|
tree
2010-02-21
Jun
i
o
C
Hamano
M
e
rge
bra
n
ch 'mv/request-pull-modernize'
commit
|
commitdiff
|
tree
2010-02-21
Dmi
t
ry Potapov
hash-obje
c
t: don'
t
use mmap() for small files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-21
N
icolas Pitre
s
ha1_f
i
l
e
: don't malloc the who
l
e
c
ompressed resul
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-21
Jona
t
han Nieder
t70
0
6-pager: if
stdout
i
s not a
t
erm
i
n
a
l, make a new
o
ne
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Junio C Haman
o
M
erge br
a
nc
h
'ma
i
n
t'
commit
|
commitdiff
|
tree
2010-02-20
Thomas Rast
c
h
erry_pick_list:
q
uit early
if one side is empty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
J
o
nathan Ni
e
d
e
r
te
s
ts: A
d
d test
s
f
o
r
a
utomatic
u
se of pager
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
René Scharfe
utf8
.
c
:
s
p
e
cul
a
tively assu
m
e utf-8 in strbuf_add_wrapped_text()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
René Scharfe
utf8
.
c
:
remove strbuf_write
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
René
S
c
harfe
utf
8
.
c: remove print_space
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
René Scharfe
u
t
f8
.
c
:
r
emove print_wrapped_t
e
x
t
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Evan Powe
r
s
git-p4: fix bug in symli
n
k hand
l
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Thomas R
a
s
t
t
1450: fix testca
s
es
that wer
e
wrong
l
y expecting
f
ai
l
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Jacob Helwig
Docu
m
e
n
tat
i
on: Fix indenta
t
ion
p
r
oblem
i
n
git-comm
i
t(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-19
Juni
o
C Hamano
Merge
b
ranc
h
'maint
'
commit
|
commitdiff
|
tree
2010-02-19
Junio C
H
amano
Merg
e
bran
c
h 'jk/maint
-
r
m
d
i
r-fix' into maint
commit
|
commitdiff
|
tree
2010-02-19
J
e
ff King
rm: fix bug
in re
c
urs
i
ve
s
u
bdirectory re
m
oval
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-19
Mark Lodato
A
dd an
o
p
tional argument for --co
l
or op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next