repo.or.cz
/
git
/
jnareb-git.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
Chri
s
t
i
a
n Couder
Docume
n
tation: descri
b
e
n
e
w
cherry-pick --ff option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Christian Couder
c
h
erry-pick:
add tests for new --ff optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
a
m
ano
revert: a
d
d --ff option to
a
llow fast forward
w
hen
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
bu
i
ltin/me
r
ge: ma
k
e
c
h
ec
k
out_fast_forward() non st
a
tic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
J
unio C
H
amano
p
arse-options: add parse_opt
i
ons_concat() to
c
oncat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-05
Junio C
Hamano
M
e
rg
e
branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Upda
t
e draft releas
e
n
otes to 1
.
7
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-05
Jun
i
o
C Ham
a
no
Merge
b
ranch '
j
n/g
i
tweb-co
n
f
i
g-error-die
'
into
m
aint
commit
|
commitdiff
|
tree
2010-03-05
Ju
n
io C Haman
o
Merge bran
c
h 'jn/
m
a
i
nt-fix-
p
ager'
i
n
to
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Ham
a
no
Merge
b
ranch 'tr
/
maint-che
r
ry-pick-list
'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-05
Junio C
H
a
mano
Mer
g
e
branch 'ld/maint-diff-quiet-w' into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio
C H
a
mano
M
e
rg
e
b
r
anc
h
'rs/optim-text-wrap' into
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge
b
ranch 'dp/read-not-m
m
ap-
s
m
a
ll-loose-objec
t
'
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge branch 'np/comp
r
ess-loos
e
-
o
bject-m
e
m
s
ave' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merg
e
br
a
nch 'jc/ma
i
n
t
-status-pre
l
oad' int
o
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge branch 'gf/maint-sh
-
setup-no
n
g
i
t-ok' into maint
commit
|
commitdiff
|
tree
2010-03-05
Ju
n
i
o
C
Ham
a
no
Merge bran
c
h
'cc/main
t
-bisect-paths' into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C H
a
m
ano
M
e
rge branch
'maint-1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Ha
m
ano
Mer
g
e
branch 'maint-1
.
6
.
5' i
n
t
o maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-05
Michal Sojka
Remove extra '
-
'
f
r
om git
-
am(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
Junio
C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Me
r
ge bran
c
h 'jh/maint-submodul
e
-s
t
atus-in-v
o
i
d' (early
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Jef
f
King
su
b
modul
e
sum
m
a
ry: do n
o
t shift a non
-
exist
e
nt positi
o
nal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
J
u
nio
C Hamano
S
t
art preparing
f
or 1
.
7
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
Jun
i
o C Ha
m
ano
Merge branch '
t
c/maint
-
transport-ls
-
r
emo
t
e-with-v
o
id
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
io C Hamano
Merg
e
branch 'h
m
/m
a
int-imap-send-crlf' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-03
J
unio C Hamano
Me
r
g
e
b
ranch 'sp/maint-push
-
s
ideband' into
ma
i
nt
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
io C Hamano
Merge
b
ranch
'
jc/maint-fix-test-pe
r
m' into maint
commit
|
commitdiff
|
tree
2010-03-03
Junio C H
a
mano
M
erge
br
a
nch 'np/fas
t
-import
-
idx-v2
'
int
o
maint
commit
|
commitdiff
|
tree
2010-03-02
Junio C
H
amano
Merge bra
n
c
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Haman
o
Mer
g
e branc
h
'jn/maint-fix-page
r
'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C Hamano
Merg
e
branch 'ml/enco
d
e
-header-refacto
r
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
erge br
a
nch
'jn/gitweb
-
config-e
r
ror-d
i
e
'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio C
Hamano
Merge branch
'
jc/for-
e
a
c
h-ref'
commit
|
commitdiff
|
tree
2010-03-02
J
u
n
io C H
a
mano
M
erge branch 'l
d
/maint-di
f
f-quiet-w'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge bra
n
c
h 'tr/maint-
c
herry-pick-list'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Ha
m
ano
Merge branch 'rs/optim-text-wrap'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o C Hamano
Merge branch
'ml/
s
end-pack-trans
p
ort-r
e
fac
t
or'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge
branch 'ml/fi
l
l-mm-refactor'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio C
H
aman
o
Merge bran
c
h
'ml/conne
c
t
-
refactor'
commit
|
commitdiff
|
tree
2010-03-02
J
unio C Hamano
Merge branch 'np/compress-loose-object-memsave'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
e
rge branch
'
dp/re
a
d-not-m
m
a
p-sma
l
l-loose-object'
commit
|
commitdiff
|
tree
2010-03-02
Ju
n
io C H
a
mano
Merge
b
ranc
h
'jn/ma
k
e
d
e
p
end'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C
H
amano
Merg
e
branch 'jc/maint-
s
tatu
s
-p
r
eload'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge bra
n
c
h
'gf/main
t
-s
h
-setu
p
-nongit
-
ok'
commit
|
commitdiff
|
tree
2010-03-02
Ju
n
io C
Ham
a
no
Mer
g
e
b
ranc
h
'jh/maint-submodule-s
t
atus
-
in-void'
commit
|
commitdiff
|
tree
2010-03-02
Ju
n
i
o C Haman
o
Merge
b
ranch 'hm/imap-send-cram-
m
d5'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Me
r
ge
b
r
a
nch 'ml/col
o
r-when'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merg
e
branch 'ac/c
v
s
import-
r
e
v
ision-
m
apping'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge
b
ranch 'jc/grep-author-all-match-implicit'
commit
|
commitdiff
|
tree
2010-03-02
Frank Li
f
a
llback SSH_
A
SKPASS when GIT_ASKPASS n
o
t set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Jakub
N
arebski
g
i
tweb: Fi
x
project-
s
pec
i
fic featu
r
e overr
i
de beh
a
vior
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Sylvain Ra
b
ot
gitweb multiple pr
o
ject root
s
documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-01
J
u
nio C Ham
a
no
M
erg
e
b
ran
c
h 'cc/maint-bis
e
ct-paths'
commit
|
commitdiff
|
tree
2010-03-01
Chr
i
stia
n
Cou
d
e
r
bisect: err
o
r out when passing bad p
a
th
parameters
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
Junio
C
Ham
a
no
Merg
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-02-28
Junio
C
Ha
m
ano
Git 1
.
7
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
Mark Lodato
R
em
o
ve refe
r
ence to GREP_COLOR
S
f
r
om
documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jonatha
n
Nie
d
er
Makefile: clar
i
fy definition of TEST_OBJS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
M
a
rk
u
s
Heidelberg
s
h
a1_name: fix segfault caused by invalid index access
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-26
Junio C
Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-02-26
J
u
n
i
o
C
Hamano
Merge branch '
m
a
i
nt-1
.
6
.
6'
i
nto maint
commit
|
commitdiff
|
tree
2010-02-25
Johanne
s
Sixt
Windows: redirect f[r
e
]open("/dev
/
null") to f[re]open
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-25
Johannes Sixt
t3301-not
e
s:
i
nsert a shbang line in
.
/f
a
k
e
_edito
r
.
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-24
Juni
o
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-24
Matt Kraa
i
commit
:
quot
e
the user na
m
e in
the example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-24
Junio C Hamano
Merge
b
ranch 'ml/maint-grep-doc' into maint
commit
|
commitdiff
|
tree
2010-02-23
Jun
i
o
C Hamano
Merg
e
branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2010-02-23
Jona
t
han Nieder
am: remove rebase-
a
pply
d
irectory before
gc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-23
Be
r
t
Wesarg
rerere:
f
ix memory leak if rere
r
e
images
can'
t
be read
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-23
B
ert Wesarg
Do
c
u
mentat
i
on
:
mention conflict marker
size argument
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-23
Nicolas Pitre
move encode_in_pac
k
_
o
bject
_
header() to
a be
t
te
r
place
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan
Ni
e
der
tests: Fi
x
race condition in t7006
-
pager
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-22
N
i
colas
Pitre
s
ha1_f
i
l
e: be
paran
o
id when creat
i
ng l
o
ose
o
b
jects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-22
Larry
D'Anna
gi
t
-diff
:
add a test for git d
i
ff
--qui
e
t -w
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-21
J
u
nio C Hamano
Merge branch 'ml/maint-grep-doc'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Ham
a
no
Me
r
g
e branch
'
tc/maint
-
transport-ls-
r
emote-
w
ith-v
o
id'
commit
|
commitdiff
|
tree
2010-02-21
Junio
C Ham
a
no
Mer
g
e
branch 'hm/maint
-
imap-send
-
crlf'
commit
|
commitdiff
|
tree
2010-02-21
J
unio C Hamano
M
erge bran
c
h 'sp/push-sideband'
commit
|
commitdiff
|
tree
2010-02-21
Juni
o
C Hamano
Merge
br
a
nc
h
'
jc
/
c
h
e
c
kout-detached
'
commit
|
commitdiff
|
tree
2010-02-21
J
unio C Hamano
M
e
rge
b
ranch 'jc/m
a
int-fix-tes
t
-
perm'
commit
|
commitdiff
|
tree
2010-02-21
Junio
C
Hamano
M
erge branch '
j
n
/
makefile-scr
i
pt-lib'
commit
|
commitdiff
|
tree
2010-02-21
Jun
i
o C Ha
m
an
o
M
e
rge branch 'm
v
/request-pull-modernize'
commit
|
commitdiff
|
tree
2010-02-21
Dmitry Po
t
apov
hash-obje
c
t: don't use mmap() for smal
l
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-21
Nicolas Pitre
sh
a
1_fi
l
e: don't malloc the whole compress
e
d
result
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-21
Jon
a
than Nieder
t7
0
0
6-pag
e
r: if stdo
u
t is not
a
t
er
m
inal, ma
k
e a new on
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
Junio
C
Ha
m
ano
Merge bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2010-02-20
Thomas Rast
c
herry_pick_list: quit early if one side is empty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jonathan N
i
e
d
er
tests
:
Add tests for
a
u
to
m
a
tic u
s
e of pager
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
R
e
n
é Scharfe
utf8
.
c: speculativ
e
ly assu
m
e u
t
f-8 in
s
t
rbuf_add_
w
r
ap
p
ed_text()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
R
e
né Sch
a
rfe
utf8
.
c:
r
emove st
r
buf_
w
rite()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
René S
c
harfe
u
t
f8
.
c: remove print_spaces()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
René Scharfe
utf8
.
c: remove print_wrapped_text()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
E
van
P
o
w
er
s
git-p4: fix bug in symli
n
k handl
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
Thomas Rast
t1450: fi
x
testca
s
es that were
wron
g
ly expecting failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jacob Helwig
Documen
t
ati
o
n: Fix indent
a
t
i
on problem in git-
c
om
m
it(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-19
Junio C Ham
a
no
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-02-19
Junio C
H
a
mano
Merge bran
c
h
'jk/maint-rmdir-fix' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2010-02-19
Jeff King
r
m:
f
ix bug in
recursive
sub
d
irectory removal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-19
Mark Lodato
Add an
o
ption
a
l
argument f
o
r
-
-col
o
r opt
i
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next