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 'jn/update-contrib-example-merge'
2010-09-03
J
u
nio C
H
amano
M
e
rge bran
c
h
'j
n
/
u
pd
a
te-contrib-examp
l
e-merge'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'j
n
/merge-renormalize'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o C Hamano
Sync with 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Git 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Thi
a
g
o Fa
r
ina
bu
i
ltin/m
e
rge
_
recursive
.
c: Add an
u
sage string and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehmann
t7406 & t7407:
a
dd
m
issing &
&
at
e
n
d o
f
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
J
e
ns Lehmann
t7405:
c
d inside sub
s
hell instead of around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio
C
Hamano
P
r
epa
r
e
for 1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio C Haman
o
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-09-01
Junio C Ham
a
no
Prepare for 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Ju
n
io C Hamano
Merge branch 'gp/pack
-
refs-remove-empty-dirs' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C Ha
m
ano
M
erge branch 'sg/rerere-gc-old-still-u
s
e
d
' int
o
maint
commit
|
commitdiff
|
tree
2010-09-01
Junio C Ham
a
no
M
erge branch 'np/maint-huge-delta-ge
n
e
r
a
tion' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Me
r
g
e branch
'dj/
f
etch-tagopt' into maint
commit
|
commitdiff
|
tree
2010-09-01
Junio
C
Hamano
Merge branch
'
da
/
fix-submodule-sync-s
u
per
p
roject-
c
onfig
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Jun
i
o C Hamano
Merge b
r
a
n
ch 'en/rebase-against-
r
ebase
-
fix' into
m
aint
commit
|
commitdiff
|
tree
2010-09-01
Junio C Haman
o
ins
t
all-w
e
bd
o
c: filter ti
m
estamp-
o
nly changes
c
o
r
rectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Junio C Haman
o
Merge branch 'np/maint-huge-delta-gener
a
tion'
commit
|
commitdiff
|
tree
2010-08-31
Junio C
Hamano
Merge branch '
d
a/fix-submodule-
s
ync-super
p
roject
-
config'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'j
n
/c
h
erry-revert-m
e
ssage-clean-up'
commit
|
commitdiff
|
tree
2010-08-31
Juni
o
C
Hamano
Merge branch 'cb
/
bi
n
ary-patch-id'
commit
|
commitdiff
|
tree
2010-08-31
Junio C H
a
mano
Me
r
g
e branch 'ab/maint-reset-mixed-w-pathspec-advice'
commit
|
commitdiff
|
tree
2010-08-31
Junio C H
a
m
ano
Merge branch 'dj/fetch
-
ta
g
o
pt'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Me
r
ge br
a
nch 'en/d-f-confl
i
ct-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C Hamano
Merg
e
bran
c
h 'jn
/
s
vn-f
e
'
commit
|
commitdiff
|
tree
2010-08-31
Juni
o
C Hama
n
o
Merge b
r
an
c
h 'tr/maint-
n
o-unq
u
ot
e
-
p
lu
s
'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
io C
H
amano
Merge bran
c
h 'jn/pa
g
in
a
te-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch '
j
n
/
maint-setup-fix
'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
M
e
rge branch
'
en/
f
ast-export-f
i
x'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Haman
o
Merge branch 'hv/autosquash-config'
commit
|
commitdiff
|
tree
2010-08-31
Junio C
Hamano
M
erge branc
h
'sg/rerere
-
gc-ol
d
-still-
u
sed'
commit
|
commitdiff
|
tree
2010-08-31
Anders Kaseorg
gi
t
web
:
Don'
t
d
i
e_error in git
_
tag after already printing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Junio
C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2010-08-30
Junio C Hamano
Me
r
ge branch 'm
a
int
-
1
.
7
.
1' into
m
aint
commit
|
commitdiff
|
tree
2010-08-30
Thiago F
a
rina
object
.
h: Add OBJECT_ARRAY_IN
I
T m
a
cro and
m
a
k
e
use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Matthieu Moy
t
0003: add mi
s
s
i
ng
&
& at
end of
li
n
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-26
J
u
nio C
Hamano
M
e
r
ge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-08-26
Ja
y
Soffian
fo
r
-ea
c
h-ref
:
fix objectn
a
me:short bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Elijah Newren
tree-walk: Correct bitrotted
comment about
t
ree
_
entry()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Li
n
us Torvalds
Fi
x
'
g
i
t
lo
g
'
e
a
rly page
r
startu
p
error case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Junio C Hamano
Merg
e
branch '
m
a
i
n
t
'
commit
|
commitdiff
|
tree
2010-08-24
Jona
t
han
N
i
e
d
e
r
p
a
rse-options: cla
r
i
f
y PARSE_OPT_NOARG descri
p
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jo
n
athan N
i
ed
e
r
t3
3
02 (n
o
tes): Port
to Solaris
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Brian Gernhardt
t7610: cd
inside
s
ubshel
l
inst
e
ad of around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-23
Jun
i
o C
Hamano
Merge branch
'maint
'
commit
|
commitdiff
|
tree
2010-08-22
Ralf Wildenhues
Typos in code co
m
ments, a
n
erro
r
message
,
documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Ralf
Wildenh
u
es
Typos in c
o
de c
o
m
m
e
nts,
a
n
error message,
documentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Nicola
s
Pitre
fi
x
>4GiB source delta
a
ssertion failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hama
n
o
Merge branch
'
mm/r
e
base-i-exe
c
'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C Ham
a
no
Merge branch 'g
b
/
spl
i
t-cmdlin
e
-errmsg'
commit
|
commitdiff
|
tree
2010-08-22
Jun
i
o
C Hamano
Merge
b
r
anc
h
'so/http-user-ag
e
n
t
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'mm/shortopt-detached'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Me
r
ge bran
c
h 'sr/l
o
cal-config
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C
Hamano
Me
r
ge branch
'nd/fix-sparse
-
checkout'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C
Hamano
Merge bran
c
h
'
hv/submodule-find-f
f
-
m
erge'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C Ham
a
no
Merge branch 'en/rebase-against-rebas
e
-fi
x
'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Ha
m
ano
Merge branch 'dg/local-mod
-
error-mess
a
g
e
s'
commit
|
commitdiff
|
tree
2010-08-22
Jun
i
o C Haman
o
Merge branch '
p
o
/userd
i
f
f
-csharp'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C Hamano
M
erge bran
c
h 'ab/perl-
i
n
s
tall'
commit
|
commitdiff
|
tree
2010-08-22
Ævar Arnfjörð Bjarmason
reset:
sugg
e
st w
h
a
t to do u
p
o
n
"
git reset --mixed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Junio C Ham
a
no
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-08-22
J
e
ns
L
ehm
a
n
n
t7403: ad
d
missing
&
&'s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Mark Rada
Tell
i
gno
r
e f
i
le ab
o
ut ge
n
erate f
i
l
e
s
in /g
i
tw
e
b/st
a
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Junio C
Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o C Ham
a
no
Mer
g
e bran
c
h
'jc/maint-follow-
r
ename-fix' into maint
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o C Hamano
Me
r
ge branch 'jn/maint-plug-leak' into
m
aint
commit
|
commitdiff
|
tree
2010-08-20
Junio C
H
amano
Merge branch 'j
n
/fix-abbrev' into mai
n
t
commit
|
commitdiff
|
tree
2010-08-20
Ju
n
io C Ham
a
no
M
e
rg
e
branch 'vs/do
c
-s
p
e
l
l' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2010-08-20
Jun
i
o C
Hamano
Merge branch 'jn/rebase-r
e
n
a
me-
a
m'
into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio
C
Haman
o
Mer
g
e
branch '
j
n/
d
oc-p
u
ll'
i
nto maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge b
r
anch 'bc/use
-
mor
e
-hardlinks-in-ins
t
a
l
l'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'tr
/
r
fc-reset-d
o
c' i
n
to maint
commit
|
commitdiff
|
tree
2010-08-20
Ram
k
umar Ram
a
c
handra
bu
i
ltin/checkout:
F
i
x message when switching to an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
M
a
tt
h
ieu
Moy
x
m
a
lloc:
i
n
c
l
ude size in
th
e
failure message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah
Ne
w
ren
merge
-
recursive: Avoid exc
e
s
sive
ou
t
put for and reprocessing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Juni
o
C Hamano
Merge branch 'm
a
i
n
t' to sync with 1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Git 1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Ju
n
i
o C Ha
m
a
no
Merge br
a
n
c
h 'tr/xsize-bits' into maint
commit
|
commitdiff
|
tree
2010-08-19
Junio
C
Hamano
Merg
e
br
a
nch 'jc/s
h
a1-name-find-fix' into maint
commit
|
commitdiff
|
tree
2010-08-19
Æv
a
r Arnfj
ö
rð Bjarmason
t/
t
9010-svn-fe
.
s
h: add
a
n +x bit to t
h
is
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
i
o C Hamano
M
erge branch 'sp/fix-smart-http-deadlock-on-erro
r
'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
Nieder
m
erge script: lea
r
n --[
n
o-]rerere-autoupdate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
m
e
rge script:
notice
@{-1} shortha
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
me
r
g
e
s
c
ript: h
a
n
d
le --no-ff --no-commit correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nied
e
r
merge
scr
i
pt:
--ff-only t
o
disallow true merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
a
n Niede
r
merg
e
script: ha
n
dle many-way octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
N
ied
e
r
m
e
rge
sc
r
ipt: hand
l
e -
m
--l
o
g
c
or
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Ni
e
der
merge s
c
ript:
forbid
m
e
r
ge -
s
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan N
i
eder
m
erge script: a
l
l
o
w custom strateg
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
on
a
than Nied
e
r
mer
g
e script: merge -X
<
opt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge scr
i
pt: i
m
prove log mess
a
ge subje
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
Nieder
m
e
rge scrip
t
: refuse
to merge during merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
a
n
Nieder
merge sc
r
i
pt: tweak unmerged fi
l
e
s message to match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Ni
e
de
r
m
erge script
:
--s
q
uash,
-
-ff from unborn branc
h
are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
fmt-merge-msg -m to o
v
e
r
ride merge title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge-base
--indep
e
ndent to pri
n
t reduced pa
r
e
nt list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Ni
e
der
mer
g
e-base --octopus to mimic show-bra
n
ch --merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
Docume
n
tati
o
n:
a
dd a
S
E
E AL
S
O sectio
n
for
merge-bas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200
(
fmt-merge-msg)
:
sty
l
e
nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
ona
t
han Ni
e
de
r
t6010 (me
r
g
e-base): moder
n
iz
e
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next