repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mm/maint-merge-ff-error-message-fix' into maint
2009-12-09
Junio C Hamano
Merge
b
r
anch 'mm/m
a
int-mer
g
e-
f
f-error-message-f
i
x'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hama
n
o
Merge b
r
anc
h
'jn/
m
aint-pull-rebas
e
-err
o
r-
m
es
s
age' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge br
a
nch 'jk/mai
n
t-
a
d
d
-p
-
d
elete-fix' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-08
J
eff
King
a
dd-intera
c
tive: fix
d
eletion
o
f
non-emp
t
y
f
i
le
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus T
o
rval
d
s
F
ix d
i
ff -B/--dirsta
t
mi
s
coun
t
ing of newly added contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff K
i
ng
reset: improve worktree saf
e
ty valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Z
u
lling
e
r
Documentation: Av
o
i
d u
s
e of xmlto --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
a
r
chive: clarify descripti
o
n of path para
m
eter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere: don't segfau
l
t on fail
u
re to open rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C Haman
o
Prepar
e
f
o
r
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
branch 'uk/maint-shortlog-encoding' int
o
main
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Haman
o
Me
r
g
e branch
'fc/ma
i
nt-format-patch-pathsp
e
c
-
d
a
shes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h 'ap/maint-me
r
g
e
-strategy-list-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch 'jc/main
t
-a
m
-keep' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch 'rs/
w
o
r
k-aro
u
nd-grep-opt-insa
n
ity' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
H
a
mano
Merge br
a
n
c
h 'rj/maint-cygwin-co
u
n
t
-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
Hamano
M
e
rge
b
r
a
n
ch 'mm/maint-hint-failed-merge' i
n
to m
a
in
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge b
r
a
nch 'th/m
a
in
t
-remote-upda
t
e-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'r
j
/maint-t9700' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge branch 'ls/m
a
int-mail
i
nfo-no
-
inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Haman
o
Merge branch 'mo/maint-crl
f
-d
o
c
'
int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
t
h
/
remote-usage
'
into m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hama
n
o
Merge branch 'pb/ma
i
n
t
-use-cu
s
tom-perl
'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
erg
e
b
ran
c
h 'm
m
/config-pathname-tilde-e
x
pand' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch 'bc/grep-
i
-F
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge bra
n
ch
'
jk/maint-break-rename-
r
educe-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch
'rj/maint-s
i
mplif
y
-cygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ha
m
ano
Merge branch 'rg/doc-
w
o
r
kflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
aman
o
Mer
g
e branch 'np/maint-side
b
and-favor-stat
u
s' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
D
o
c
umen
t
at
i
on:
x
mlto 0
.
0
.
18 does not kn
o
w --string
p
aram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
B
randon
C
asey
t4201: us
e
ISO8859
-
1 r
a
ther than ISO
-
885
9
-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pull:
clarify advi
c
e for the
u
n
c
onfigu
r
ed error case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Unconditional
l
y set ma
n
.
b
a
se
.
url
.
for
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Doc
u
men
t
ation/
M
akefi
l
e: allow man
.
base
.
url
.
for
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Pr
e
p
ar
e
for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C H
a
man
o
m
erge: d
o
not add sta
n
dard message wh
e
n me
s
sage is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Haman
o
Do not misidentify "g
i
t me
r
ge foo H
E
AD" as an old-
s
tyle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Agui
l
ar
help
:
Do not
u
nnec
e
ssarily look for a repos
i
tory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
M
icha
e
l J G
r
uber
Documentatio
n
: F
i
x a few
i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
David Soria Parra
Documentation:
D
o
cument --br
a
nc
h
op
t
ion in git c
l
one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthie
u
Moy
builtin
-
me
r
ge: sho
w
user-
f
riendly error messa
g
e
s
for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matt
h
ieu
M
oy
merge-recursive: make the
e
rror-message g
e
ne
r
ation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Ave
r
y Pennar
u
n
builtin-merg
e
.
c: call exc
l
u
d
e_cmd
s
()
correctly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ha
m
ano
Remove dead
c
ode fro
m
"
git
am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
F
elipe
Contrer
a
s
f
o
rmat-pat
c
h:
add test for
par
s
ing of "--"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contreras
f
o
r
m
at-patch:
fix parsin
g
of "--" on the
c
o
mmand l
i
ne
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C H
a
m
a
n
o
bui
l
tin-apply
.
c:
pay at
t
ent
i
on to -p<n> when determining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kl
e
ine-König
shortlog:
r
e
spect commit en
c
oding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Nico
l
as
Pitre
pack-objects: split i
m
plications of --
a
l
l-prog
r
ess
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
S
tephen Boy
d
instaw
e
b: re
s
tar
t
server i
f
already ru
n
ning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
prune-p
a
ck
e
d: only
s
h
o
w progress w
h
en st
d
e
r
r is a
t
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
J
unio C
Ha
m
ano
Protect scripted Porcelains from GREP_OPTIONS insanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René Sc
h
arfe
mergetool--lib: simpl
i
fy
gue
s
s_
m
erge_tool()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
M
a
tthieu Moy
user-manual: Docu
m
ent that "git mer
g
e
"
doesn't like
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Mat
t
hieu Moy
me
r
ge-r
e
cursive: point the user to c
o
mmi
t
when fi
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
io C H
a
ma
n
o
Documentation: avoid
xmlto input error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Raman Gupta
Add
b
ra
n
ch man
a
gement for
r
eleases to gitworkf
l
ows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Lukas Sa
n
dst
r
ö
m
git am/mai
l
i
nfo
:
Don't lo
o
k at in-b
o
dy headers
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
T
i
m Henigan
git remote: Separate usage strings for su
b
co
m
m
a
nds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
H
a
mano
diffcor
e
-
rename: reduce memory footprint
b
y freeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jones
git-
c
ou
n
t-
o
bjects: Fix
a
disk
-
space
u
nder-estimate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
G
r
eg
Price
Docu
m
entation:
u
ndocu
m
ent gc
'
d function graph_release()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
R
amsay Jones
t9
7
00-pe
r
l-git
.
s
h
: Fix a
t
est failure on
Cygw
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-19
Matthieu Moy
expand_us
e
r_path: ex
p
and ~ to $HO
M
E, not to
t
he actual
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-18
Matthi
e
u Mo
y
Expand
~
and ~user
in core
.
excludesfil
e
,
commit
.
template
amended by
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Phil
i
p
p
e
Bruhat
.
.
.
M
ake sure $PERL_PATH is
d
efined when t
h
e
t
est
s
uite
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Matthew Ogilvie
core
.
a
utocr
l
f
d
o
cumentati
o
n
:
m
ention the cr
l
f attrib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Brian
C
olli
n
s
g
r
ep: Allow
c
ase insen
s
itive search of f
i
xed-s
t
r
i
ngs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
diffcore-break: save cnt_data
f
or ot
h
e
r
phases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
d
iffcor
e
-
break: fr
e
e files
p
e
c
data as we go
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Junio
C
Hamano
Git
1
.
6
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge
b
ranch 'b
s
/maint
-
pr
e
-commi
t
-
h
o
ok-sample' into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
J
unio C Ham
a
no
Merge branch 'jk/maint-a
d
d-p-empty' into mai
n
t
commit
|
commitdiff
|
tree
2009-11-16
Junio C Haman
o
Mer
g
e branch 'js/maint-diff
-
col
o
r-words'
i
nt
o
m
aint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Haman
o
Merge bra
n
ch 'tz
/
maint-rpm' int
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge br
a
nch 'jk/main
t
-
f
ormat-patch-p-suppress-stat
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C
Ha
m
an
o
Merge branch 'pb/main
t
-gitweb-blob-line
n
o' into
maint
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io C
H
ama
n
o
Merg
e
bra
n
ch 'jk/
m
aint-
1
.
6
.
3-ls-files-i' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge
b
ranch 'vl/maint-openssl-signature-cha
n
ge'
into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ha
m
ano
Merge
branch
'
jk/m
a
int-push-
c
on
f
ig'
int
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io C H
a
m
an
o
Merg
e
bran
c
h
'
sr/blame-i
n
c
o
mplete' in
t
o maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge b
r
anch 'jc/maint-blank-at-eof'
i
nto maint
commit
|
commitdiff
|
tree
2009-11-16
J
unio C
H
ama
n
o
M
e
rge branch 'jc/maint-1
.
6
.
3-graf
t
-trailing-
s
pace'
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o
C
Hama
n
o
Me
r
ge
b
r
a
nch
'tr/ma
i
nt-
r
o
ff-qu
o
te' into maint
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io C
H
amano
Merge b
r
anch 'ja/fetch-doc'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io C Haman
o
Mer
g
e branch '
c
b/do
c
-fetch
-
pu
l
l-merg
e
' into maint
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C Hamano
Me
r
ge branch 'jk/mai
n
t-cvsimport-p
a
thna
m
e' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C Haman
o
Merg
e
branch 'jc/
r
ecei
v
e
-
pac
k
-
auto' into ma
i
nt
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o C Hamano
Me
r
g
e branch 'gb/mai
n
t-gitweb-esc-param' into
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch
'jn/gitweb-patch' into maint
commit
|
commitdiff
|
tree
2009-11-15
Tim
H
enigan
Update 'git rem
o
te upda
t
e' usage
str
i
ng
t
o
m
a
tch man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
T
odd Zullinger
Makefile: Ensure
rpm packages can be rea
d
by older
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
S
tephen Boy
d
git-add
.
txt: fix forma
t
ting
o
f --
p
atch section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
N
icola
s
Pitre
gi
v
e p
r
ior
i
ty to
p
rog
r
ess mess
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-11
Junio C Ham
a
no
c
h
e
c
k-ref-f
o
r
m
at -h: it
d
oes not
k
now the --pr
i
nt option
ye
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
han Nieder
merg
e
:
do not se
t
up worktr
e
e
t
wice
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
check-ref-for
m
at:
u
pdate usag
e
s
tring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-09
Ra
m
say Jones
Mak
e
file: merge two
Cygw
i
n confi
g
uratio
n
sections into one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next