repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: alphabetize include list
2019-08-19
E
l
ijah Newren
merge-recursive: alp
h
abetiz
e
include list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
merge-rec
u
rsiv
e
: add sanity ch
e
c
ks for
r
e
l
evant merge_options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah
N
e
w
ren
m
erge-r
e
cur
s
i
v
e:
r
ename MERGE
_
RECURSIVE_* to MERGE_VARIA
N
T_*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-
r
ecursiv
e
: split i
n
ternal fi
e
lds
into a separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
me
r
ge-recu
r
s
i
ve: avoid losin
g
output and
l
eaking m
e
mory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
jah Newren
m
erge-r
e
cursi
v
e: comment
and reorder the merge_options
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merg
e
-recur
s
i
ve: con
s
olid
a
te unnece
s
sa
r
y
fields
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
merge-r
e
c
u
rsiv
e
: move s
o
me defi
n
itio
n
s aroun
d
to clean
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-
r
e
c
u
rsive: rename merge_
o
p
tions
a
r
g
ument to opt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
r
en
m
e
rge-recursive: rename 'mrtree' to 'result
_
tree',
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah New
r
en
merge-re
c
ur
s
ive
:
use
common
name for ances
t
or
s
/common
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: fix some overly long lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
e
wren
cache-tree: s
h
are code between
functions
writing a
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
m
erge-recursive:
d
on't force
e
xternal callers to do
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
merge-recursive:
remove
u
seless paramete
r
in merge_t
r
ees()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
mer
g
e
-recursi
v
e: exit early if
index
!=
h
ead
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wre
n
E
nsure ind
e
x matches he
a
d before in
v
o
king merge mac
h
in
e
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
j
a
h Ne
w
ren
m
e
rge-rec
u
rsive:
remov
e
another i
m
plicit d
e
pendency
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
merge-
r
ecursiv
e
: future-proof update_file_flags()
aga
i
nst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Derrick Stolee
merge-recursive: intro
d
uce an
e
num
f
or detect_directory_
r
e
n
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
e
w
r
en
me
r
g
e
-
recu
r
si
v
e: provide a
b
ett
e
r label for diff3 common
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ijah Newren
merg
e
-recursive:
enforce opt->ance
s
tor
!= NULL when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Ne
w
ren
checko
u
t:
p
rovid
e
better confli
c
t
h
unk description
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elijah N
e
wren
merge-
r
ecursive:
be co
n
sistent
with assert
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-16
Junio C Hamano
Git 2
.
23
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-16
Junio C Hama
n
o
Merge tag 'l10n-2
.
23
.
0
-rnd2' of
git://
g
it
h
ub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2019-08-12
Juni
o
C Hamano
S
y
nc with Git 2
.
22
.
1
commit
|
commitdiff
|
tree
2019-08-12
M
a
rk Rusha
k
of
f
doc: f
i
x re
p
e
a
ted words
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-11
Junio C Ham
a
no
Git 2
.
22
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-11
Phi
l
i
p
Oakley
.
mailmap: update email address
o
f Ph
i
l
ip O
a
kley
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-09
Junio C
Hamano
Merge b
r
anch 'cb/xd
i
ff-no-system-includes-in-dot-
c
.
.
.
commit
|
commitdiff
|
tree
2019-08-09
Juni
o
C
H
amano
M
e
rge b
r
anch 'jk/no-system-in
c
lud
e
s-in-d
o
t-c' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2019-08-09
J
uni
o
C Ham
a
no
Merge bra
n
ch 'sg/fsck-
c
onfi
g
-in-doc
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2019-08-09
Junio C Hamano
Mer
g
e branch
'
jk/xdiff-c
l
amp-funcname
-
context
-
index
.
.
.
commit
|
commitdiff
|
tree
2019-08-09
J
u
n
i
o C Ham
a
no
Git 2
.
2
3
-rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-09
Junio C H
a
m
a
n
o
Me
r
ge
b
r
anch 'bc/h
a
sh-indep
e
ndent
-
tests-part-4'
commit
|
commitdiff
|
tree
2019-08-09
Junio
C
Hamano
Merge branch 'rs
/
plug-st
r
bu
f
-reak-
i
n-re
a
d-alt-re
f
s'
commit
|
commitdiff
|
tree
2019-08-09
Junio C Hamano
M
e
rge branch 'm
t
/
d
ir-iterato
r
-updat
e
s
'
commit
|
commitdiff
|
tree
2019-08-09
Junio C Hamano
Merge branch 'd
s
/commit-graph-inc
r
emental'
commit
|
commitdiff
|
tree
2019-08-08
Junio C Ham
a
no
Merge branch 'ja/l10n-fix
e
s
'
commit
|
commitdiff
|
tree
2019-08-08
J
u
nio C H
a
m
ano
M
e
r
g
e bra
n
c
h
'e
n
/disable-di
r
-re
n
ame-i
n
-re
c
u
rsiv
e
-
merge'
commit
|
commitdiff
|
tree
2019-08-08
Junio C H
a
m
ano
Merge b
r
a
n
c
h
'nd
/
switc
h
-and-restore'
commit
|
commitdiff
|
tree
2019-08-08
Junio C Hamano
Merge
branc
h
'mr/
d
oc-can-not-to-c
a
nn
o
t
'
commit
|
commitdiff
|
tree
2019-08-08
J
u
nio
C
Hamano
Merge branch
'
d
s
/commit-graph-oct
o
pu
s
-fix'
commit
|
commitdiff
|
tree
2019-08-08
Jeff Kin
g
t0
0
00: reword
comments for "local" test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-08
Jona
t
han
N
ieder
t:
d
ecrease nesting in test_
o
id_to_pa
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-07
Ren
é
Scharfe
sh
a
1-file:
rel
e
ase strbuf after use
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-07
Ren
é
Sc
h
arfe
te
s
t-dir
-
i
t
e
r
ator
:
u
s
e pat
h
argument direc
t
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-07
Re
n
é
S
char
f
e
dir-iterator: release s
t
rbuf aft
e
r use
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-07
René Schar
f
e
c
om
m
it-g
r
aph: r
e
lease strbufs
a
f
ter use
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-06
Jean-Noël Avila
l1
0
n: reformat some locali
z
ed strings
f
or v
2
.
23
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-06
E
lijah Newren
merge
-
r
e
cursive
:
avoi
d
directory r
e
name detection
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-05
Der
r
ick
Stolee
co
m
m
i
t
-
graph
:
fix b
u
g arou
n
d octopus me
r
ge
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-05
William Ch
a
r
g
in
restore:
f
ix typo
i
n docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-05
M
a
r
k
Rushakoff
doc: typo: s/c
a
n not/can
n
ot/ and s/
i
s doe
s
/
d
oes/
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-02
Junio
C
Ham
a
no
Git 2
.
23-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-02
Junio C
Hama
n
o
Merg
e
b
r
a
nch 'sg/fsck
-
config
-
in-doc
'
commit
|
commitdiff
|
tree
2019-08-02
Junio C Haman
o
M
e
rge branch 'js/vis
u
al-studio'
commit
|
commitdiff
|
tree
2019-08-02
Junio
C
Hamano
Me
r
ge branch '
j
c/log-
m
ail
m
ap-flip-defaul
t
s'
commit
|
commitdiff
|
tree
2019-08-02
Junio C Hamano
Merge branch 'js/early-co
n
f
i
g
-with-onbranch'
commit
|
commitdiff
|
tree
2019-08-02
J
u
nio C Hamano
log: really flip
the --mailmap defaul
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-01
Junio C Hamano
Merge
branch
'
j
k/repack-silence-auto-bitm
a
p
-warn
i
n
g
'
commit
|
commitdiff
|
tree
2019-08-01
Juni
o
C Hama
n
o
Mer
g
e branch '
j
k/sort-iter-test-output'
commit
|
commitdiff
|
tree
2019-08-01
Junio C Hamano
M
e
rge branch 'jc/dir-iterator-
t
est-fix'
commit
|
commitdiff
|
tree
2019-08-01
J
u
nio
C
Hamano
Merge branch 'bc/has
h
-independent-tests-part-4'
commit
|
commitdiff
|
tree
2019-08-01
Martin Ågre
n
RelNotes/2
.
23
.
0: fix
a few typos
a
nd other
m
i
nor issue
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-01
Juni
o
C
Hamano
Syn
c
wit
h
maint
commit
|
commitdiff
|
tree
2019-08-01
Martin
Å
gren
RelNot
e
s
/2
.
21
.
1:
ty
p
o
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-01
Junio C Hamano
log
:
f
l
ip the --m
a
i
l
m
a
p
defau
l
t
unc
o
ndi
t
ionally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Joha
n
nes Schindelin
conf
i
g: work around
b
ug with includeif:onbranch and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Jun
i
o
C
H
amano
A fe
w
mo
r
e last-minute fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Junio C
H
amano
Merge branch
'
cb/x
d
iff-no-system-includ
e
s-in-
d
ot-c'
commit
|
commitdiff
|
tree
2019-07-31
Junio C Ham
a
no
M
e
rge branch 'j
k
/no-
s
ystem-includes-in-dot-c
'
commit
|
commitdiff
|
tree
2019-07-31
Jeff King
repack: simplify
h
andling of auto-bitmaps and
.
kee
p
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Je
f
f King
repack: sil
e
nce warnings when auto-enabled bitma
p
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Jeff
K
ing
t
7
700: clean u
p
.
kee
p
file
i
n bitm
a
p-writi
n
g test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Jef
f
King
t: sort output
o
f has
h
map
iter
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-30
Juni
o
C Hamano
t
e
st-dir-iterat
o
r:
d
o not
a
s
sume errno values
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Schindelin
git: avoid calling
a
liased
b
uiltins via their dashed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes
Schindelin
bin-wrapper
s
: appen
d
`
.
e
x
e`
t
o target paths if necessary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Joh
a
n
nes S
c
hindelin
.
giti
g
nore: ignore Visual Studio's temporary/generated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Phil
i
p
Oakl
e
y
.
gitignore: touch up the e
n
tr
i
es regar
d
i
n
g Visual S
t
udio
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Jo
h
annes Schind
e
lin
vcxproj: also l
i
nk-
o
r-copy buil
t
i
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Schind
e
lin
msvc
:
a
dd a
Makefile target to pre-generate the Visual
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes S
c
hindelin
cont
r
ib/builds
y
s
t
ems: add a b
a
ckend for moder
n
V
isual
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Schindelin
co
n
t
r
ib/b
u
ildsystems: h
a
n
dle options star
t
i
ng with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Schindelin
contrib
/
buildsystem
s
: also ha
n
dl
e
-lexpat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Sc
h
i
n
d
e
li
n
contr
i
b/buildsyste
m
s: handle
libic
o
nv,
t
o
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
P
h
ilip Oakle
y
c
ont
r
ib/
b
uildsystems: han
d
le the curl library
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
J
ohannes
S
chind
e
lin
co
n
trib/buildsy
s
tems: error
out on u
n
kno
w
n
opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Philip Oakle
y
contrib/buildsyst
e
ms: o
p
t
i
onally
capture the dry-
r
un
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Philip Oakley
c
o
ntrib
/
buil
d
sy
s
te
m
s
: redirect errors of
the
d
ry run
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
P
hili
p
O
a
kley
contrib/buildsystems: ignore gettext stuff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Phi
l
ip Oakley
cont
r
i
b
/b
u
ildsystems
:
hand
l
e q
u
oted spaces in filenames
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Philip Oakley
contrib/buildsystems: f
i
x mislea
d
ing error mess
a
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Schindelin
contrib
/
buildsystems: i
g
nore irrele
v
an
t
f
i
les i
n
Generators/
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Phil
i
p O
a
k
l
ey
cont
r
ib/buildsyste
m
s
:
i
gnore inva
l
i
dcontinue
.
obj
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
J
ohannes S
c
hindelin
Vcproj
.
pm: urle
n
c
o
de '<' and '>' w
h
en g
e
ner
a
t
ing V
C
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
J
ohannes Schindel
i
n
Vcproj
.
pm: do not configure VCWebServiceProxyGene
r
atorTool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
P
h
ilip Oak
l
ey
Vcproj
.
pm: l
i
st
git
.
e
x
e
f
irst to be startup
project
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next