repo.or.cz
/
git
/
wpalmer.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
Ch
r
istian C
o
uder
Documentation: describe
n
ew c
h
erry-pick --ff option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Ch
r
i
s
tian
Couder
cher
r
y-pick: add tests for new
--ff o
p
tio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
revert:
a
dd --ff option to allo
w
fast forward wh
e
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Ham
a
n
o
builtin
/
m
erge: make chec
k
out_fast_forward() non static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
parse-
o
ptio
n
s: add parse
_
options
_
concat
(
) to co
n
cat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-05
J
u
n
i
o C Hama
n
o
Merge
b
r
anch '
m
a
i
n
t
'
commit
|
commitdiff
|
tree
2010-03-05
Junio
C
Hama
n
o
Update draft release notes to 1
.
7
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-05
Junio
C
Hamano
Merg
e
branch 'jn
/
gitweb
-
config-error-die' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-05
Junio C H
a
m
ano
M
erge branch
'jn/maint-fix-pager' into maint
commit
|
commitdiff
|
tree
2010-03-05
Juni
o
C Hamano
Merge branch 'tr/mai
n
t-cherry-pick-
l
ist' into
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge
branch 'ld/maint-
d
if
f
-
q
uiet-w
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge branch '
r
s
/
optim-text-w
r
ap' into
m
aint
commit
|
commitdiff
|
tree
2010-03-05
Junio C
Ham
a
n
o
Merge branch
'
dp/r
e
ad-n
o
t-mma
p
-small-loose-o
b
ject'
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio
C
H
amano
Merge bra
n
ch 'np/compr
e
ss-lo
o
se
-
object-mem
s
a
v
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge branch 'jc/maint-status-preload' into mai
n
t
commit
|
commitdiff
|
tree
2010-03-05
J
unio C Haman
o
Merge
branch 'gf/maint-sh-set
u
p-nongit-ok'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-05
Jun
i
o C Hamano
Merge branch 'cc/
m
a
i
nt-bisect-paths'
into
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio
C
H
amano
Merge branch 'maint-1
.
6
.
6' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-05
J
u
ni
o
C
Hamano
Merg
e
branch 'maint-1
.
6
.
5' in
t
o maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-05
Michal Sojka
Rem
o
v
e extr
a
'
-
' from git-am(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2010-03-03
J
u
nio C H
a
m
an
o
Merge bran
c
h 'jh/maint-
s
ubmodule-status-in-v
o
id' (early
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Jef
f
King
su
b
mod
u
le su
m
ma
r
y: do n
o
t s
h
ift a non-ex
i
s
tent positio
n
al
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
St
a
r
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
J
u
nio
C
Hamano
Merge branch 'tc/maint
-
transport-ls-remote-with-v
o
id
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Merge branch 'hm/mai
n
t-i
m
a
p
-
s
end-c
r
lf' into maint
commit
|
commitdiff
|
tree
2010-03-03
J
u
nio
C Hamano
Merge bran
c
h
'
s
p
/maint-push-sid
e
band' into maint
commit
|
commitdiff
|
tree
2010-03-03
Junio
C
Hamano
M
erge br
a
nch 'jc/main
t
-
fi
x
-test-perm'
i
nto m
a
int
commit
|
commitdiff
|
tree
2010-03-03
Junio C Ha
m
an
o
Merge
b
ranch
'np/f
a
st-import-idx-
v
2' into main
t
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-02
Junio C H
a
mano
Merge branch
'
jn/maint-fix-pager
'
commit
|
commitdiff
|
tree
2010-03-02
Juni
o
C Hamano
Mer
g
e
branch 'ml/encod
e
-header-re
f
a
c
tor'
commit
|
commitdiff
|
tree
2010-03-02
J
unio
C
H
a
mano
Merge branch 'jn/gitw
e
b-config-e
r
r
o
r-d
i
e'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hama
n
o
Merge branch 'jc
/
for-each-ref'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Ham
a
no
Merge branch '
l
d/
m
aint-dif
f
-
q
uiet-w'
commit
|
commitdiff
|
tree
2010-03-02
Juni
o
C Haman
o
Mer
g
e bra
n
c
h
'
tr/main
t
-cherry-
p
ic
k
-list'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Ha
m
a
no
M
erge branch
'
r
s/op
t
im-tex
t
-wrap'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Me
r
ge branch 'ml/se
n
d-p
a
ck-tra
n
spo
r
t-
r
e
f
actor'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio C H
a
mano
Merge bran
c
h 'ml/fill-mm-refact
o
r'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C Ham
a
no
Merge br
a
nch 'ml/connect-refactor'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge branch 'np/compress-loos
e
-
o
bje
c
t-memsave'
commit
|
commitdiff
|
tree
2010-03-02
Junio C
Hamano
M
e
r
g
e
b
ranch
'
dp/read-not-mmap-
s
mall-loos
e
-object'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Ham
a
n
o
Merge br
a
n
c
h
'jn/m
a
kedepend'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Me
r
ge bra
n
ch
'jc/maint-sta
t
us-prelo
a
d'
commit
|
commitdiff
|
tree
2010-03-02
Junio C
H
aman
o
Merge branc
h
'
gf/main
t
-sh-setup
-
nongi
t
-ok'
commit
|
commitdiff
|
tree
2010-03-02
Junio C
Ha
m
ano
Merge branch 'jh/mai
n
t-submodule-status
-
in
-
v
oid'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge
b
r
anch
'
hm/imap-send-cra
m
-m
d
5'
commit
|
commitdiff
|
tree
2010-03-02
J
unio C Hamano
Mer
g
e branch
'
ml/color-whe
n
'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C
H
amano
M
e
rge branch 'ac/cvsim
p
ort-revision-map
p
ing'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio C Hamano
Merge branch 'jc/gr
e
p
-auth
o
r-all-match-im
p
li
c
i
t
'
commit
|
commitdiff
|
tree
2010-03-02
Frank Li
fallbac
k
SSH_AS
K
P
ASS
when GIT_ASKPASS
not se
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Jakub Narebski
g
i
t
we
b
: Fix project-specifi
c
f
eature override
b
e
havior
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Sy
l
vain Rabot
gitweb multiple
project roots
d
ocum
e
ntat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-01
Junio
C
Hamano
Merge bra
n
ch 'cc
/
m
a
i
nt
-
bise
c
t-paths'
commit
|
commitdiff
|
tree
2010-03-01
Ch
r
istian Co
u
der
bi
s
e
ct:
e
rr
o
r out wh
e
n
p
assing
b
ad
pa
t
h para
m
eters
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
Junio C Hamano
Merge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2010-02-28
Juni
o
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_COLOR
S
from documen
t
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jona
t
han Ni
e
der
Ma
k
efile: clarify d
e
fini
t
i
o
n
of
TE
S
T_OBJS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
M
a
rk
u
s Heidel
b
erg
s
h
a1
_
name: fix segfaul
t
caused by in
v
a
l
i
d i
n
dex
a
c
c
e
ss
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-26
Junio
C
Hamano
M
e
r
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-02-26
Junio C Haman
o
Merge bran
c
h 'maint-1
.
6
.
6' into
m
ai
n
t
commit
|
commitdiff
|
tree
2010-02-25
J
ohanne
s
S
ixt
Windows: r
e
d
i
rect f
[
re]open("/
d
e
v/null")
to f[re
]
open
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-25
Johannes
S
ixt
t3301
-
notes: insert
a
shbang line in
.
/fake_editor
.
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-24
Junio
C Hamano
Mer
g
e bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2010-02-24
Matt Kraai
commit: quote the user name in the example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-24
J
u
nio
C
Haman
o
Merge
b
ranch 'm
l
/main
t
-g
r
ep-doc
'
into maint
commit
|
commitdiff
|
tree
2010-02-23
Juni
o
C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-23
Jonathan
Nieder
am
:
r
e
move
re
b
ase-ap
p
ly
direct
o
ry before gc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-23
Bert Wesarg
rerere:
f
ix memory leak
if rerere ima
g
es 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
ment
a
tion: mention co
n
f
li
c
t marker size argu
m
ent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-23
Nicolas
Pitr
e
mov
e
enc
o
d
e
_in_pack_ob
j
ect_header()
to
a bett
e
r
p
lace
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jona
t
han Nieder
tests:
Fix race condition in
t
7
006-pager
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-22
Nicolas Pitre
sha1_file:
b
e
paranoid when creating loose objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-22
Larr
y
D'Anna
git-d
i
f
f:
a
dd
a
test
for g
i
t d
i
ff --quiet
-
w
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-21
Ju
n
io C Hamano
Merge
branch 'ml/maint-grep-doc'
commit
|
commitdiff
|
tree
2010-02-21
Juni
o
C Hamano
Merge branc
h
'tc/m
a
int-transpo
r
t
-
ls-rem
o
te-with-void'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Hama
n
o
Me
r
g
e branch 'hm
/
m
aint-imap
-
se
n
d-crlf'
commit
|
commitdiff
|
tree
2010-02-21
J
unio
C Hamano
M
e
rge branch 'sp/push-sid
e
band'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Ham
a
n
o
Merge branch 'jc/checko
u
t
-
d
e
tached'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Hamano
Merge branch 'jc/m
a
i
n
t-
f
ix-tes
t
-per
m
'
commit
|
commitdiff
|
tree
2010-02-21
Jun
i
o C Hamano
Merge branch 'jn/makefile-sc
r
ip
t
-lib'
commit
|
commitdiff
|
tree
2010-02-21
Juni
o
C Hamano
Merge
b
r
a
nch
'mv/request-pull-mo
d
e
r
nize'
commit
|
commitdiff
|
tree
2010-02-21
Dmit
r
y Potapov
hash
-
objec
t
: don
'
t u
s
e m
m
ap(
)
for small files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-21
N
i
colas
Pitre
s
ha1_file: don't malloc the who
l
e com
p
r
essed result
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-21
J
o
nath
a
n Ni
e
der
t7006-pager: if stdout
i
s
not a terminal,
m
ake
a
new
o
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
Junio C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-02-20
Tho
m
as Rast
cherry_
p
ick_list:
quit early
if one si
d
e is em
p
ty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jonathan Niede
r
t
e
sts:
Add tests
for
automatic use
of pager
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
R
e
n
é Scharfe
u
tf8
.
c: sp
e
culativ
e
l
y
assume utf-
8
in
s
trbuf_add_wrapped_text()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
René Scharfe
utf8
.
c
:
remove strb
u
f_write
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
R
e
né Schar
f
e
u
t
f8
.
c: remove p
r
int_spaces()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
R
e
né
Sc
h
arfe
u
tf8
.
c: remove print_wrapped_text()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
E
v
an
Powers
git
-
p4:
fix bug in s
y
mlink handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
T
h
omas Rast
t1450: fix testcases t
h
at were wrongly
expe
c
ting fail
u
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-20
J
a
cob Helwig
Documentati
o
n:
Fix indentatio
n
pr
o
blem in gi
t
-commit(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-19
Juni
o
C H
a
mano
M
erge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-02-19
J
unio
C H
a
man
o
M
erge branch
'
jk/mai
n
t-rmdi
r
-fix'
into maint
commit
|
commitdiff
|
tree
2010-02-19
Jeff
King
rm: fix bu
g
in recursive
s
ubdirecto
r
y r
e
moval
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-19
M
ark
L
odato
A
d
d an op
t
iona
l
argu
m
ent for -
-
color options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next