repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jl/maint-fix-test'
2010-08-22
Jon
S
e
ymou
r
detac
h
e
d-
s
tas
h
: update Documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jon Seymour
detache
d
-stash
:
tests of
git stas
h
with stash-like
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jon Seymour
detached-stash:
s
implif
y
gi
t
stas
h
show
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jo
n
Seym
o
ur
det
a
ched-sta
s
h: simplify git s
t
a
s
h bran
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jon Seym
o
ur
detached-stash
:
r
e
factor git stash pop impleme
n
t
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
J
o
n
Seymour
detached-stash: simplif
y
st
a
sh_d
r
o
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jon Seymour
detached-s
t
ash: simp
l
i
fy stash_ap
p
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
J
on Sey
m
our
de
t
ach
e
d
-stas
h
: work a
r
ound git r
e
v
-
parse fail
u
re
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
J
on
S
ey
m
our
det
a
ched-
s
tash: introduc
e
parse_fla
g
s_and_revs fu
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Junio C
H
a
m
ano
Merg
e
branch 'mm/rebase-
i
-exec'
commit
|
commitdiff
|
tree
2010-08-22
Juni
o
C Hamano
Merge
branch 'gb/split-cmdline-
e
rrm
s
g'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Ha
m
ano
Merge branch 's
o
/http-user-agent'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Hamano
Merge bra
n
ch 'mm/shortopt-detached'
commit
|
commitdiff
|
tree
2010-08-22
J
u
n
i
o C Hamano
Merge branc
h
'sr/local-config'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Ham
a
n
o
Merge branch 'nd
/
fix-spars
e
-checko
u
t
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hama
n
o
Merge br
a
nch
'
hv/submodule
-
find-ff-merge'
commit
|
commitdiff
|
tree
2010-08-22
Junio C
H
aman
o
Merge branch '
e
n/reb
a
se-
a
gai
n
st-rebase-fix'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'dg
/
local-mod-err
o
r-messages
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Ham
a
no
Merge branch '
p
o/userdiff-
c
sharp'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch
'
ab/perl-install'
commit
|
commitdiff
|
tree
2010-08-22
Ævar Arnfjörð Bjarm
a
son
reset
:
suggest what to
d
o upon "
g
i
t
reset
-
-mixed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Juni
o
C Hamano
Mer
g
e branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2010-08-22
J
o
natha
n
Nied
e
r
ap
p
ly: handle traditi
o
na
l
patches with space in filen
a
me
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
J
o
nat
h
a
n
Nie
d
er
tests: exercise "gi
t
appl
y
" wit
h
w
eird
f
ilenames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jonatha
n
N
ied
e
r
apply: split
q
u
oted fil
e
name handling
into new
f
u
n
c
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Jens Lehman
n
t7403:
a
d
d missing
&
&'s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
Mark Rada
Tell
ig
n
o
r
e
f
i
l
e about generate files in /
g
it
w
eb/sta
t
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-22
J
e
ff King
docs: fix Makefil
e
d
e
pendency fo
r
user manual
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
J
ona
t
han N
i
eder
Documentati
o
n
:
remove stray backslash in sho
w
-branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Docum
e
n
t
ati
o
n: rem
o
ve stray backslashes from "F
i
g
h
ting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan Nieder
Documentation:
d
o
n
ot convert
.
.
.
op
e
rator to elli
p
ses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nied
e
r
Documentatio
n
: av
o
id str
a
y backsla
s
h in user
manua
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
D
o
cumentation: av
o
id st
r
ay
b
ackslas
h
e
s
in
c
ore t
u
to
r
ia
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nat
h
an Nieder
Do
c
ument
a
tion: remove stray back
s
las
h
es in rev-pa
r
se
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan Nieder
Documentation: remov
e
backslash
befor
e
~ in fast
-
i
m
p
ort
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
D
ocumentatio
n
: remove stray b
a
c
k
slash
f
rom "g
i
t bundle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
than Nieder
Documenta
t
i
o
n/te
c
hnical: av
o
id stray
backslash
i
n parse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonat
h
an Nieder
Documentation: remove backslashe
s
i
n manpage synops
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
J
o
n
athan Nie
d
e
r
D
o
cumentation: clarify
quoting in gitig
n
o
re
docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan N
i
eder
Documentation
:
clari
f
y quoti
n
g i
n
"git
r
m" e
x
ample
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jona
t
h
a
n
N
i
eder
D
o
cumentation: add missing
q
u
otes
to "git
g
rep" examples
Cc: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
N
i
eder
Doc
u
mentat
i
on
:
c
larify quoting in "g
i
t add" example
Cc: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonath
a
n Nieder
D
ocumentation:
unbre
a
k regex i
n
s
h
ow-ref
manual
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: quoting
tr
o
ubl
e
in "git
r
m" discu
s
sion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jona
t
han Nie
d
er
Docum
e
ntat
i
on: twe
a
k des
c
ription of
log
.
date
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
m
ergetool: Re
m
ove explic
i
t references
t
o
/
dev/
t
ty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Junio C
H
aman
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-08-20
Junio
C
Hamano
M
e
rge b
r
anch 'jc/maint-
f
ollow-rename-fix'
i
nto
m
aint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Haman
o
Merge branch 'jn/main
t
-pl
u
g-lea
k
' into maint
commit
|
commitdiff
|
tree
2010-08-20
J
u
n
io C
H
amano
Me
r
g
e
branch 'jn
/
fix-abbrev' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge
b
r
anch 'vs/d
o
c
-spell' into maint
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio C Ham
a
no
Merge branch
'jn/rebase
-
rename-am' into
m
ain
t
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio C Hamano
Merge branch
'
jn/doc-pull' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C
Ham
a
no
Merge bran
c
h 'bc/use-m
o
r
e-hardlinks-in
-
insta
l
l
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'tr/rfc-res
e
t-doc' int
o
maint
commit
|
commitdiff
|
tree
2010-08-20
Ramkumar Ramachan
d
ra
b
u
iltin/checkout: Fix mess
a
g
e
when s
w
itching to an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonat
h
an Nieder
D
o
cu
m
ent
a
tion: set a !DOCTYPE for user
manual
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
M
a
tthieu Moy
xmalloc:
i
nc
l
ude size in the failure message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Newren
m
erge-
r
ec
u
rsive
:
Avoid exces
s
i
v
e output for and reprocessing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio
C
Hama
n
o
M
erge
b
ranch 'maint' to sync with
1
.
7
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Ham
a
n
o
Git 1
.
7
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
J
u
nio C Ham
a
no
Merge
b
ranch 'tr
/
xs
i
ze-bits' into main
t
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Me
r
ge
b
r
a
nch 'jc/sha1-name-find-fix'
i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2010-08-19
Jonathan N
i
e
d
er
a
u
toconf: don't use platform regex if it lack
s
REG_STARTEND
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Ævar Arnfjörð
B
j
armason
t/t7008-grep-binary
.
sh: un-TODO a t
e
st that nee
d
s REG_
S
T
ARTEN
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
compat/
r
e
g
ex: get rid of o
l
d-style definition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Æ
var
A
rn
f
j
ö
rð Bjarmason
t/t9010-svn-fe
.
sh: add a
n
+x b
i
t to this tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Æ
v
ar
A
rnfjö
r
ð Bj
a
rma
s
on
compat/re
g
ex: defi
n
e out variabl
e
s only us
e
d
under
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C
H
a
m
ano
M
e
rge
b
ran
c
h 'sp/fix-smart-ht
t
p-deadlock-on-e
r
ror'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
F
r
ank Li
Chang
e
reg
e
rror() declaration from K&
R
styl
e
t
o
A
N
SI
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfj
ö
rð Bjarm
a
son
comp
a
t/regex: get the g
a
wk regex engin
e
to
co
m
pi
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Ævar
A
rnf
j
örð Bjarm
a
son
comp
a
t
/
re
g
ex: use the reg
e
x engine from
g
awk for compa
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Ni
e
der
m
erge
s
cript: learn --[no-
]
rerere-au
t
o
update
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nat
h
an Nieder
me
r
ge scri
p
t: not
i
ce @{-1} sh
o
rt
h
a
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merge
s
cript: handle
--no-ff
-
-no-commi
t
corre
c
tl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merge s
c
ript: --ff-only
t
o disallow true mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
than Nieder
m
e
rge
sc
r
ipt: h
a
ndle
many-way
octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
mer
g
e script: handle
-m
--log correctl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merg
e
script: forbid m
e
rge -s ind
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
d
er
merge s
c
rip
t
:
allow custom
strategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
me
r
ge sc
r
ip
t
:
merge -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge script: improve log message
s
ubjec
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Ni
e
d
e
r
m
erge script
:
refuse
to
m
er
g
e
during
m
erg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan
N
iede
r
merge script:
tweak unmerged fi
l
es message to match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merge script: --squ
a
sh,
-
-ff fro
m
unbo
r
n bra
n
ch
are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Niede
r
fmt-merge-msg -m to override mer
g
e ti
t
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge-base
-
-independen
t
to p
r
int reduced
pare
n
t list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merge-
b
ase --oct
o
pus
t
o mimic
show-branch
-
-m
e
r
ge
-
b
a
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Ni
e
d
er
Doc
u
mentation:
a
dd a SEE
ALSO s
e
ction for merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan Nieder
t620
0
(fmt-
m
e
rge
-
m
sg): style nitpick
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nied
e
r
t6010
(
me
r
ge-base): m
o
dernize s
t
yle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
t7600 (merge): test
merge f
r
om bra
n
ch yet to
be born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Nied
e
r
t7600
(merge): check re
f
log entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7
6
0
0 (
m
erge)
:
do not launch
gitk fo
r
--debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nath
a
n Nieder
t
7600 (merge)
:
mod
e
rnize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge:
do not
mistake (ancestor of) tag for br
a
n
ch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
subm
o
dule s
y
nc: Upd
a
te "submodul
e
.
<
na
m
e>
.
url"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjör
ð
Bj
a
rm
a
son
tests: fix syntax error in
"U
s
e
adv
i
se
(
)
for hi
n
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Junio C H
a
mano
Merge bran
c
h '
j
c/maint
-
fol
l
ow-re
n
ame-fix'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
amano
Merge br
a
nch 'tf/
s
t
r
ing-li
s
t
-init'
commit
|
commitdiff
|
tree
next