repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mg/doc-bundle'
2010-08-19
Junio C H
a
mano
Mer
g
e
b
r
anch 'jc/
s
h
a
1-name-find-fix' into maint
commit
|
commitdiff
|
tree
2010-08-19
Ævar Arnfjö
r
ð Bjarma
s
on
t
/
t90
1
0
-svn-fe
.
sh: a
d
d
an +x bit
t
o thi
s
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
unio
C
H
a
m
ano
Merge bra
n
c
h 'sp/fix-smart-http-
d
e
a
d
lock-on-error'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
a
n Nieder
m
erge scri
p
t: learn
--[no-]rer
e
re-aut
o
update
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han
Nieder
merge script:
notice @
{
-1}
s
h
o
rthand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merge scri
p
t
:
handle
-
-no-ff --n
o
-commit corr
e
ctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nat
h
an Nieder
merge scri
p
t: --f
f
-
o
nl
y
to
d
isa
l
low true merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan
N
ieder
m
e
rge s
c
ript: handle
man
y
-way octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
me
r
ge script
:
handle
-m -
-
l
o
g
correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge scrip
t
: forbid
merge
-s
i
ndex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan
N
ieder
merge scr
i
pt: allow custom strategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
mer
g
e sc
r
ipt: m
e
rge -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan Nieder
merge s
c
ri
p
t
:
improve log message subject
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan N
i
eder
merge scrip
t
: r
e
fu
s
e to merge
dur
i
ng
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
e
r
merge scri
p
t: tweak unmerged
f
i
l
es mess
a
ge to
matc
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
merge
s
cript: --
s
qu
a
sh, --ff fro
m
u
nbo
r
n
bran
c
h
are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
fmt-merge-ms
g
-m
to ov
e
rr
i
de merg
e
titl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Ni
e
der
merge-base --ind
e
pendent to p
r
int reduced parent list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Ni
e
d
er
merge-base --octopus to mimic show
-
branch --me
r
ge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han
Nied
e
r
Documentation:
add a
S
EE
ALS
O
s
e
ction for mer
g
e-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
t6200 (fm
t
-merge-m
s
g): style
n
i
tpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6010 (mer
g
e
-
ba
s
e):
modernize styl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
ona
t
h
an Nieder
t7600 (
m
erge): test merge
f
rom branch
yet to
be
b
or
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
t7600
(
merge): check
reflog entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
t
7
6
0
0
(m
e
rge): do not launch gitk
for --deb
u
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge)
:
m
oder
n
i
z
e style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge: do not mistake (ancestor
o
f)
tag for bran
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submod
u
le sync: Update "submod
u
le
.
<
n
am
e
>
.
ur
l
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Æv
a
r Arnfjörð B
j
a
rmason
t
es
t
s: fix syntax error in "Use adv
i
se(
)
for hin
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
H
a
m
a
no
Merge branch
'jc/maint-fo
l
l
o
w-r
e
na
m
e-fix'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merg
e
b
ranch 't
f
/
s
tring-list-init'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
amano
M
e
rge branch
'
c
c/find-commit-subje
c
t'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch '
j
n/maint-plug-l
e
ak'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hamano
Mer
g
e bra
n
ch 'jl/s
u
bmodule-ignore-diff'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Ha
m
ano
Merge branch 'ml/rebase
-
x-strategy'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
Hamano
Me
r
ge
bra
n
ch 'jn/fi
x
-abbrev'
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C
H
amano
M
erge
bran
c
h
'
vs/doc-spel
l
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jh/use-te
s
t-must-
f
ail
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
Hamano
Merge branch 'jh/clean-exclude
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
a
mano
Merge b
r
a
nc
h
'kf/post-recei
v
e
-sample-hook'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Me
r
ge
branch 'ab/report-corrupt-
o
bject-with-typ
e
'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C Hamano
Merge branch 'jn/r
e
base-rename-am'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Mer
g
e branch
'
jn/fa
s
t-import-subtree'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
Hamano
Merge b
r
a
nch 'ar/string-
l
ist-fo
r
each'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branc
h
'jh/graph-next-line'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
ano
Merge branch 'tr/x
s
i
z
e
-
bits'
commit
|
commitdiff
|
tree
2010-08-18
Elija
h
New
r
en
merge-recursive: Fix mult
i
ple file rename ac
r
oss
D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
t6031: Ad
d
a
te
s
tcase
c
o
vering multiple ren
a
mes a
c
ross
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
Newr
e
n
m
erge-recursive: Fix
typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hamano
M
e
rge bran
c
h
'tc/checkout-B'
commit
|
commitdiff
|
tree
2010-08-17
D
avid Ag
u
ilar
mer
g
e
tool: S
k
ip autoresolved p
a
ths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-17
Cleme
n
s
Buchacher
hash bi
n
ary sha1 into patc
h
id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-17
Petr Onde
r
ka
U
s
erdiff pat
t
erns for
C
#
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan
N
iede
r
t
7
006
(
pager): add missing TTY pre
r
equisites
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Ng
u
yễ
n
Th
á
i Ng
ọ
c Duy
merge-fi
l
e: run setup_git_dir
e
ctory_gently() sooner
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thá
i
Ngọ
c
Duy
var: ru
n
setup_git_directory_gently(
)
s
ooner
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễ
n
Thái Ngọc Duy
ls-remote: r
u
n
setup_git_directory_gently()
s
ooner
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Ng
u
yễn Thái Ngọc Duy
index-pack: run setup
_
git
_
dire
c
tory_gently() sooner
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Junio C Hamano
Merge branch 'jn
/
ma
i
nt-setup-
f
ix' (early par
t
)
into
.
.
.
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thá
i
Ngọ
c
Duy
c
onf
i
g: ru
n
set
u
p_g
i
t
_
d
irectory_g
e
ntly
(
) sooner
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn
Thái Ngọc Du
y
b
undle: run setup_
g
it_directory_gentl
y
(
) soon
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
N
g
uyễn
T
hái Ngọc Du
y
apply: run setup_git
_
dire
c
tory_gently()
s
ooner
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Ævar Ar
n
fjörð
Bjarmason
log: te
s
t for regression introduced in v
1
.
7
.
2
-
r
c0~103^2~2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Niede
r
cherry
-
pi
c
k/re
v
ert
:
Use ad
v
ise()
f
or hints
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nied
e
r
cherry-pick/rev
e
rt: U
s
e error() f
o
r
fa
i
lure messa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan N
i
e
d
er
Introduce advi
s
e() to print hin
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonath
a
n N
i
e
d
e
r
Eli
m
i
nate
“Fin
i
she
d
cherry-pick
/
re
v
er
t
” mes
s
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jo
n
athan Nieder
t9010 (
s
vn-
f
e): avoid s
y
mlinks in
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jona
t
h
an Nieder
t
9010 (svn-fe): use Unix-style path in URI
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan N
i
eder
vc
s
-svn: Av
o
id %z in format s
t
ring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
o
nathan Nieder
vcs-svn: Rename
d
i
r
e
nt pool t
o
build on
W
i
ndows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Niede
r
compat: add strt
o
k
_
r()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
onath
a
n N
i
eder
treap: style fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jon
a
than Nieder
v
cs-sv
n
:
remove build artifacts on "
m
ake cle
a
n"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonat
h
an Nieder
svn-fe manual: Clarify warning
a
bout deltas in dump
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
onathan Nieder
Update svn-fe
manual
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Davi
d
Barr
SVN dump par
s
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
David B
a
rr
Infrastruc
t
ure to write revisions in fast
-
export format
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
David B
a
rr
Add stream helper library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Da
v
id Bar
r
Add string
-
spec
i
fic memory pool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
ason Evans
Add treap im
p
lementation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
David
B
arr
Add memory
p
ool library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonath
a
n
N
ieder
Introduce vcs-svn
l
ib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Daniel Joh
n
son
fetch: all
o
w command line --tags t
o
o
verride config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Brandon Casey
git-rebase--in
t
erac
t
ive
.
sh
:
use printf
i
nstead of echo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Brandon Casey
g
i
t-re
b
ase--in
t
eract
i
ve
.
s
h: rework skip_u
n
necessary_picks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
d
iff --follow: do
c
all diffcore_std() as
necessary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ham
a
no
diff --follow: do not waste
c
ycles
whil
e
r
e
cursing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Æv
a
r Arnfjörð Bjarmason
perl/Makefile: Uns
e
t I
N
STALL_BAS
E
when making perl
.
mak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
El
i
jah Newren
Mark tests
t
hat use symlinks as
n
eedi
n
g SYMLINKS
p
rereq
u
isite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pull
--rebase: Avoid
s
p
u
rio
u
s conf
l
icts an
d
re
a
ppl
y
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah N
e
w
r
e
n
t
552
0
-pu
l
l: Add testcases s
h
owing spur
i
ous conflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hama
n
o
Merg
e
branch 'jc/sha1-name-find-fix'
commit
|
commitdiff
|
tree
2010-08-13
Ju
n
io C Hamano
Merge branch
'
jn/doc-p
u
ll'
commit
|
commitdiff
|
tree
2010-08-13
J
u
nio C Hamano
Merge branch 'jn/maint-
g
itweb-dy
n
conf'
commit
|
commitdiff
|
tree
2010-08-13
J
u
nio C H
a
mano
Merge branch 'bc/use-more-hardlin
k
s-in-install'
commit
|
commitdiff
|
tree
2010-08-13
J
unio C Hamano
Merge branch 't
r
/
rfc
-
r
e
set-doc'
commit
|
commitdiff
|
tree
2010-08-13
J
unio C Hamano
M
e
rge branch 'jn/
p
arse-dat
e
-basic'
commit
|
commitdiff
|
tree
2010-08-13
J
unio C
H
ama
n
o
Merge branch
'sp/fix-smart-htt
p
-
d
ea
d
lock-on-error'
commit
|
commitdiff
|
tree
2010-08-13
Junio C
H
amano
Merge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
next