repo.or.cz
/
git
/
dscho.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' into next
2010-08-22
Junio C Ham
a
no
Mer
g
e branch 'jn/update-contrib-example-merge' into
.
.
.
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Mer
g
e branch 'd
a
/fix-submo
d
ule
-
sy
n
c-superproject-config
.
.
.
commit
|
commitdiff
|
tree
2010-08-22
Ju
n
io C
H
a
mano
Merge b
r
a
nch 'jn/
c
herry-rever
t
-messag
e
-clean-up' into
.
.
.
commit
|
commitdiff
|
tree
2010-08-22
Juni
o
C Hamano
Merge branch 'ab/maint-r
e
set-mixed-w-pat
h
s
p
e
c-advice
.
.
.
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge b
r
anch 'master' into next
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Mer
g
e
branch 'mm/rebase
-
i-exec'
commit
|
commitdiff
|
tree
2010-08-22
Jun
i
o C Hamano
Merge branch 'g
b
/s
p
lit-cmdline-errmsg'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Hama
n
o
Me
r
ge branch 'so/http-us
e
r-age
n
t'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Haman
o
Merge bra
n
ch 'mm/shortopt-detached'
commit
|
commitdiff
|
tree
2010-08-22
Junio
C
Hamano
M
e
rg
e
bra
n
ch 'sr/local-c
o
nfig'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Haman
o
Merge branch 'nd/fix-spar
s
e-c
h
eckout'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
M
erge branch '
h
v/submodule-f
i
n
d
-ff
-
merge'
commit
|
commitdiff
|
tree
2010-08-22
J
unio C Hamano
Mer
g
e
branch 'en
/
rebase-against-reb
a
se-fix'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'dg/loca
l
-mod-error-messages'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Ha
m
ano
Me
r
ge
bran
c
h 'p
o
/userdif
f
-
csharp'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Ham
a
no
Merge branch 'ab/perl-install
'
commit
|
commitdiff
|
tree
2010-08-22
Ævar
Arnf
j
ö
r
ð
B
jarmason
reset:
s
u
ggest what to do upo
n
"git
reset --mi
x
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hama
n
o
Merge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2010-08-22
Jens
Lehmann
t7403: add
missin
g
&
&
'
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Mark
R
ada
Te
l
l
i
gnore file about
g
e
n
e
rat
e
files
i
n
/gitw
e
b/static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio C Hamano
Merge br
a
nch 'en/d-f
-
co
n
flic
t
-fi
x
' into next
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge
bran
c
h 'ma
s
ter' into next
commit
|
commitdiff
|
tree
2010-08-20
J
unio C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-08-20
J
u
nio C
H
a
m
a
n
o
Merge
branch 'jc/maint
-
f
o
llow-r
e
name-fix' in
t
o m
a
int
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merg
e
branch 'j
n
/mai
n
t-plug-leak' into maint
commit
|
commitdiff
|
tree
2010-08-20
Ju
n
io C
H
a
mano
M
e
rge bra
n
ch 'jn/
f
ix-abbrev' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio
C Hamano
Merge bra
n
ch 'vs/do
c
-spell' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-08-20
Junio
C
Hamano
Merge
b
ranch 'jn/rebase-rename-am
'
into
maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hama
n
o
Merge branch 'jn/do
c
-pull' into main
t
commit
|
commitdiff
|
tree
2010-08-20
Junio C
H
amano
Merge branc
h
'bc/use-more
-
h
ardlinks-in-install' into
.
.
.
commit
|
commitdiff
|
tree
2010-08-20
Junio C Ha
m
ano
Merge b
r
anch
'
tr/
r
fc-reset
-
doc' into maint
commit
|
commitdiff
|
tree
2010-08-20
Ramkumar Rama
c
handr
a
builtin/check
o
ut: Fix messag
e
when s
w
it
c
hing to an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Matthieu Moy
xmalloc:
i
ncl
u
de size in the
f
a
ilu
r
e message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Ne
w
ren
m
erge-recursive: Avoid exce
s
sive
o
utput f
o
r
a
n
d reprocessing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Haman
o
Merge bran
c
h 'jn/
s
vn-fe' into next
commit
|
commitdiff
|
tree
2010-08-19
Junio
C
Hamano
Mer
g
e branch 'mas
t
er' in
t
o nex
t
commit
|
commitdiff
|
tree
2010-08-19
Jun
i
o C
Hamano
Merge br
a
nch 'm
a
int' to
s
y
n
c with 1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
J
u
n
io
C
Ha
m
ano
Git 1
.
7
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Merge bra
n
c
h
'
tr/xsize-bits' into maint
commit
|
commitdiff
|
tree
2010-08-19
Juni
o
C Haman
o
Me
r
ge branch 'jc/sha1-n
a
me-fin
d
-fix
'
into maint
commit
|
commitdiff
|
tree
2010-08-19
Æva
r
Arnf
j
örð
Bjarmason
t/t9
0
1
0-s
v
n-fe
.
sh: add an +x bit to th
i
s test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Mer
g
e branch
'sp/fi
x
-smart-http-d
e
adlock-on-er
r
or'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Ha
m
ano
Merge branch 'ab/test' into next
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hamano
Merge b
r
anch
'
jn/pagina
t
e-fix' into
n
e
x
t
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Hamano
Merge bra
n
ch
'tr/
m
aint-no-unquote-p
l
us'
i
n
to next
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o
C
H
amano
M
erge branch 'j
n
/m
e
rge-reno
r
m
a
lize' into
n
ext
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
M
erge branch 'sg/re
r
ere-gc-old
-
sti
l
l
-
used'
into ne
x
t
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Hamano
Merge branch
'
hv/aut
o
squ
a
sh
-
co
n
fig' into next
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Me
r
ge br
a
n
ch 'en/
f
ast-export-fix' into next
commit
|
commitdiff
|
tree
2010-08-18
J
unio
C Hamano
Merge b
r
anch 'j
n
/maint-setup-fix' i
n
t
o next
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Hama
n
o
Merge
branch 'jn/svn-fe' into
next
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
ano
Mer
g
e
b
ranch 'po/userdiff-csharp' int
o
next
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge scrip
t
:
learn --[no-]rerer
e
-aut
o
update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han N
i
e
der
merge scri
p
t: not
i
ce @{-1} shorthand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an
Ni
e
der
merg
e
script: handle
-
-no
-
ff --no-commi
t
cor
r
ect
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge script: --
f
f-only to disallow true mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nat
h
an N
i
eder
merge script: handle
man
y
-way oct
o
pus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
N
ieder
mer
g
e scri
p
t: handle -m -
-
l
og correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
merg
e
scr
i
pt: forbid
merge -s
in
d
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan N
i
ede
r
m
e
rge
s
crip
t
:
allow cus
t
om strategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
on
a
tha
n
Nieder
merge
s
cript: m
e
rge -X
<
option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
m
erge s
c
ript: imp
r
ove log m
e
ssage su
b
ject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
e
der
m
e
rge scr
i
pt: refuse to merge during merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
i
ede
r
merge script
:
twe
a
k unmerged files
m
e
ssage to match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
m
e
rg
e
script: -
-
squash, --ff from unborn bran
c
h
a
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
f
m
t-m
e
rge-msg -m t
o
override merge title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
than Nieder
merge-base
-
-ind
e
pendent to
print redu
c
e
d
p
arent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nath
a
n
N
ieder
me
r
ge-base
-
-octopus to m
i
mic show
-
branc
h
--merge
-
ba
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
D
ocumentation
:
add a SEE ALSO
s
e
cti
o
n for merge-bas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
t6200 (fmt
-
merge-msg): style nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onatha
n
Nieder
t6010 (merge-base
)
: moder
n
i
z
e st
y
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t
7600 (merg
e
): test
merge from b
r
anch ye
t
t
o
be b
o
rn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
ha
n
Nie
d
e
r
t
7600
(merge): check reflog
e
n
t
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7
6
00 (merge): do not launch g
i
tk for
--debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
t
7
600 (m
e
rge)
:
moderni
z
e style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
me
r
ge: do no
t
mis
t
ake
(ances
t
or
o
f) tag
for bra
n
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguil
a
r
submodule sy
n
c: Update
"submodule
.
<name>
.
u
rl"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arn
f
jörð
Bjarmason
tests
:
f
ix syntax error in "Use adv
i
se() for hints
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hamano
M
erge
b
ranch 'en/
d
-f-c
o
nflict-fix' into
n
ex
t
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ham
a
no
Merge branch 'master' into next
commit
|
commitdiff
|
tree
2010-08-18
Junio C Haman
o
Merge b
r
anch 'jc/maint-follow-rename-fix'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hamano
Merge branch 'tf/string-list-i
n
i
t'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
i
o C
H
a
mano
Merge branc
h
'cc/find-commit-subject'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
cvs
tests: do not t
o
uch test CVS repos
i
tori
e
s sh
i
pp
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æv
a
r
Arnfjörð Bj
a
r
mason
t/t9602-cvsimport-b
r
anches-t
a
g
s
.
sh: Add
a
P
E
RL
prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjö
r
ð Bjarmaso
n
t
/t9601-cvsi
m
port-ve
n
dor
-
branch
.
sh: Ad
d
a
PE
R
L pr
e
requisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æ
v
ar
Arnf
j
örð B
j
armason
t/
t
71
0
5-reset-p
a
tch
.
sh: Ad
d
a
PERL prerequisi
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmas
o
n
t/t9001-send-email
.
sh: con
v
ert setup
c
ode to tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æv
a
r
Arnfjörð Bjarmason
t/t9001-send-
e
mail
.
sh
:
c
h
ange fro
m
skip_all=* to prereq
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æ
var A
r
nfjörð Bjarmason
t
/
t9001-
s
end-emai
l
.
s
h: Remove ne
e
dle
s
s PRO
G
=* assignment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfj
ö
rð Bjarma
s
o
n
t/t960
0
-cvsimport
.
s
h
:
c
hange from skip_all=* to prereq
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar A
r
n
fjörð Bjarmason
lib-
p
atch-m
o
de tests:
change fr
o
m
skip_all=
*
to prereq
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
t/t3701-add-interacti
v
e
.
sh
:
change from skip_all=*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æ
var
A
rnfjörð Bjarmason
t
ests: Mo
v
e FILEMODE
p
rerequis
i
te to
lib-prereq-F
I
LEMODE
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æ
var Arnfjö
r
ð
Bja
r
m
a
son
t/Makefile: Create tes
t
-resul
t
s
dir
for smok
e
target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar
A
r
nfjörð Bjarmason
git-notes: Run
partial ex
p
e
n
sive test everywh
e
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfj
ö
rð
B
jarmason
t/t3300-funny-names: change from skip_all=* to prereq
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
t/t3902-quoted: change fro
m
skip
_
all
=
* to prereq skip
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æv
a
r Ar
n
fjö
r
ð Bja
r
ma
s
on
t
/t4016-diff-quote: chan
g
e
from
skip
_
all=
*
to prer
e
q
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar
Arnfjörð B
j
armason
t/t5
5
03-ta
g
fo
l
low:
chan
g
e from ski
p
_a
l
l=* to prereq
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next