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: fix some overly long lines
2019-08-19
Elijah Newren
merge-rec
u
rsive:
fi
x
so
m
e
o
verly l
o
ng
lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
c
a
che-tree: shar
e
c
o
de between
f
unction
s
writ
i
ng a
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: do
n
't force external ca
l
le
r
s to do
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
mer
g
e
-
r
ecursiv
e
: remove useless pa
r
a
m
eter in
m
erge_trees()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
m
erge-recur
s
ive: ex
i
t
e
arly if index != head
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
Ensure i
n
de
x
ma
t
ch
e
s h
e
ad before invoking merge
machine
r
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-re
c
ursive: remove anot
h
er implicit depe
n
d
ency
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
j
ah Newren
merge-recur
s
ive: f
u
ture-proof update_file
_
flags() aga
i
nst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Der
r
ick Stolee
merge-recursi
v
e
:
in
t
rodu
c
e
a
n
enum
for
d
etect_directory_rena
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
merge-
r
ecursive:
p
rovide a bett
e
r label for diff3 c
o
mmon
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elij
a
h Ne
w
r
e
n
merge-r
e
cursive: enforc
e
opt->ancestor != NU
L
L when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-16
E
lijah New
r
e
n
chec
k
out: provid
e
bet
t
e
r c
o
n
flict h
u
nk description
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-16
El
i
j
a
h Newr
e
n
merge-recur
s
ive: be consistent with a
s
sert
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 Haman
o
Merge
t
ag 'l10n-2
.
23
.
0-rnd
2
' of gi
t
://gith
u
b
.
com/
g
it
.
.
.
commit
|
commitdiff
|
tree
2019-08-12
Junio C H
a
man
o
Sync with Git 2
.
22
.
1
commit
|
commitdiff
|
tree
2019-08-12
Mark Ru
s
hakof
f
doc
:
f
ix repeated word
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-11
Junio C Ha
m
ano
Git 2
.
2
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-11
P
hilip Oakley
.
mailma
p
:
u
p
date
e
m
ail ad
d
res
s
o
f Philip Oak
l
ey
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-09
Junio C Hamano
Mer
g
e branch 'cb/xdi
f
f-no-syst
e
m-
i
n
c
lu
d
e
s-in-d
o
t-c
.
.
.
commit
|
commitdiff
|
tree
2019-08-09
Junio
C
Hamano
Merge branch 'jk/no-sy
s
tem-i
n
clud
e
s
-
i
n-dot-c' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2019-08-09
Junio C
H
a
m
ano
Merge branch 'sg/fs
c
k
-config-in-doc' into maint
commit
|
commitdiff
|
tree
2019-08-09
Junio C Hamano
Merge branch
'
jk/xdiff-cl
a
mp-f
u
nc
n
ame-context-i
n
dex
.
.
.
commit
|
commitdiff
|
tree
2019-08-09
Junio C Hamano
Gi
t
2
.
23-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-09
Junio
C
Hamano
Merg
e
bra
n
ch '
b
c
/ha
s
h
-indepen
d
en
t
-tests-part-4'
commit
|
commitdiff
|
tree
2019-08-09
Ju
n
i
o
C
Hamano
Merge branch 'rs/plug-strbu
f
-reak
-
in-re
a
d-alt-ref
s
'
commit
|
commitdiff
|
tree
2019-08-09
Junio
C
Hamano
Mer
g
e branch 'mt/dir-iterator-updates'
commit
|
commitdiff
|
tree
2019-08-09
Junio C Hamano
Merge br
a
nch 'ds/com
m
it-graph-i
n
cremental
'
commit
|
commitdiff
|
tree
2019-08-08
Jun
i
o C Hamano
Merge branch 'ja/
l
10n-fixes'
commit
|
commitdiff
|
tree
2019-08-08
Junio
C
Hamano
Me
r
ge branch 'en/di
s
able-dir-r
e
na
m
e-in
-
recursiv
e
-merge'
commit
|
commitdiff
|
tree
2019-08-08
Junio C
H
ama
n
o
Merge br
a
nch
'nd/sw
i
tch-and-restor
e
'
commit
|
commitdiff
|
tree
2019-08-08
J
u
nio C Hamano
M
e
rge br
a
nch
'
m
r
/doc-can-not-
t
o-cannot'
commit
|
commitdiff
|
tree
2019-08-08
Junio C Hamano
Merge
b
ranch 'ds/
c
ommit-graph-o
c
topus
-
fix'
commit
|
commitdiff
|
tree
2019-08-08
Jeff King
t0000: rewo
r
d comments
f
or "lo
c
al" tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-08
Jonatha
n
N
ieder
t: decrease
nesting i
n
test_oid_to_
p
ath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-07
R
e
né Scharf
e
sha1
-
file: release
s
t
rbuf after use
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-07
R
ené Scharfe
test-dir-it
e
ra
t
or: use
p
ath argument directly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-07
René
S
charfe
dir
-
i
t
e
r
ator:
r
e
l
eas
e
strbuf after use
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-07
René Scharfe
c
o
mmit-graph: release strbu
f
s afte
r
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 localized
s
tr
i
ngs for v2
.
23
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-06
Eli
j
ah
New
r
en
merge-recursi
v
e: avo
i
d directory rename
d
e
tect
i
on in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-05
Derrick
S
t
olee
c
o
m
mit-
g
raph: fix bug around oct
o
pus merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-05
William Ch
a
rgin
res
t
ore: fix typo in docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-05
Mark Rus
h
akoff
doc: ty
p
o
: s/can not/cannot/ a
n
d s/is does/doe
s
/
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-02
J
u
nio C
Hamano
Git 2
.
23-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-02
Junio C Hamano
Merge b
r
anc
h
's
g
/fsck-config-in-doc'
commit
|
commitdiff
|
tree
2019-08-02
Junio C Hamano
Merge bran
c
h 'j
s
/vis
u
al-studio
'
commit
|
commitdiff
|
tree
2019-08-02
J
u
nio C Hamano
Merge b
r
anch 'jc/log-mailmap-flip-defa
u
lts'
commit
|
commitdiff
|
tree
2019-08-02
Junio C
H
a
mano
Merg
e
bra
n
c
h
'js
/
early-config-with-onbr
a
nch'
commit
|
commitdiff
|
tree
2019-08-02
J
u
n
io C Hamano
l
o
g: really
flip
the --mailmap def
a
ult
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-01
Junio C H
a
mano
Mer
g
e
branch
'
jk/r
e
p
ac
k
-silence-auto-bitma
p
-wa
r
ni
n
g'
commit
|
commitdiff
|
tree
2019-08-01
Juni
o
C Ham
a
no
Merge branch 'jk/sor
t
-iter-tes
t
-
o
u
tput'
commit
|
commitdiff
|
tree
2019-08-01
J
uni
o
C Hamano
Me
r
g
e
branch 'jc/dir-iterat
o
r-test-fix'
commit
|
commitdiff
|
tree
2019-08-01
J
u
n
i
o
C Hamano
Mer
g
e branch 'bc
/
hash-independe
n
t-tests-par
t
-4'
commit
|
commitdiff
|
tree
2019-08-01
Mar
t
in Ågren
RelNotes/
2
.
23
.
0:
fix a few
t
ypos and othe
r
minor issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-01
Juni
o
C Hamano
Sync with
ma
i
nt
commit
|
commitdiff
|
tree
2019-08-01
Marti
n
Ågren
RelN
o
t
e
s/2
.
21
.
1: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-08-01
Junio C Hamano
log: flip th
e
--ma
i
lmap
defaul
t
uncon
d
itionall
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Johannes Schindelin
config: wo
r
k around bug with i
n
cludeif:onbran
c
h and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Ju
n
i
o
C
Hamano
A few m
o
re la
s
t-minute f
i
xes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Junio
C Hamano
Merge
b
ranch 'cb
/
x
diff-no-system-
i
n
c
ludes-in-d
o
t-
c
'
commit
|
commitdiff
|
tree
2019-07-31
J
u
nio C Haman
o
Mer
g
e
branch 'jk/no-system-inc
l
udes-in-dot-c'
commit
|
commitdiff
|
tree
2019-07-31
Jeff King
repack: simplify h
a
ndling of auto-bitmaps and
.
k
e
ep
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
J
e
ff King
r
ep
a
ck: si
l
ence warnings
w
hen
a
u
t
o-e
n
abled bi
t
maps
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Jef
f
King
t
7
700:
c
lean up
.
keep file
in bitm
a
p-writing test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-31
Jef
f
King
t: sort output of hashmap itera
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-30
Junio
C
Hamano
test-dir-it
e
ra
t
o
r: do no
t
a
ssume errno values
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Schinde
l
in
gi
t
: avoid calling aliased b
u
ilti
n
s
v
ia t
h
eir d
a
sh
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
J
oh
a
nnes Sc
h
indelin
bin-wrappers: append `
.
exe
`
to
target paths if ne
c
es
s
ary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes
S
c
h
i
ndelin
.
gitignore: ign
o
re Visual Stud
i
o's temporary/
g
ener
a
ted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Phil
i
p
O
a
kley
.
g
itignor
e
: touch up t
h
e entries regarding
V
isual
S
t
ud
i
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Schindelin
v
cxproj: also link-or-
c
opy builtins
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
J
o
hannes Schin
d
elin
msvc: add a
Makef
i
le t
a
rget to pr
e
-
g
e
n
e
ra
t
e the Visual
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Joh
a
n
nes Schindelin
c
ontrib/builds
y
stems
:
add
a
backend for modern Visual
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
J
o
hann
e
s Schindelin
contrib/buil
d
s
y
stems: h
a
ndle
options startin
g
w
i
th
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Schi
n
deli
n
c
ontrib/builds
y
stems: also hand
l
e -lexpat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Schindelin
con
t
rib/buil
d
syste
m
s:
handle libiconv, too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Philip Oakl
e
y
contrib/bui
l
dsys
t
ems: handle the
curl
l
ibrary o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Sc
h
indelin
c
ontrib/b
u
ildsyst
e
ms: error o
u
t on unknow
n
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Philip Oa
k
le
y
cont
r
ib/buildsyste
m
s
: option
a
l
ly cap
t
ure the dry-run
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
P
hilip Oakley
contrib/buildsystems: redirect er
r
ors of t
h
e dry run
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
P
hi
l
i
p Oakl
e
y
con
t
rib/bui
l
d
systems: ign
o
re gettext stuff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Philip O
a
k
ley
contr
i
b/bu
i
ldsy
s
tems
:
handle
quoted s
p
aces i
n
filenam
e
s
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
P
h
ilip Oa
k
ley
contrib/build
s
ystems: fix misleading error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Schind
e
l
in
c
ontrib/buildsy
s
tems:
i
g
nore irrelev
a
nt files i
n
Generators/
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Philip Oakley
contrib/buil
d
systems: ign
o
re
invalid
c
o
nt
i
nue
.
obj
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johan
n
es
S
c
h
indelin
Vcproj
.
p
m
: urlencode '<' an
d
'>' whe
n
generatin
g
VC
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Johannes Schinde
l
in
Vcpr
o
j
.
pm: d
o
n
ot confi
g
ure VCWebSer
v
ic
e
ProxyGeneratorTool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Philip Oak
l
e
y
Vc
p
roj
.
pm: list git
.
exe first to
b
e
startup
p
roject
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Jo
h
anne
s
Schind
e
li
n
Vcproj
.
pm: auto-ge
n
erate GU
I
Ds
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Junio C
H
amano
Git 2
.
23-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
Juni
o
C
Hamano
Sync with
m
aint
commit
|
commitdiff
|
tree
2019-07-29
Junio C Ha
m
ano
Mer
g
e br
a
nch 'js/rebas
e
-cle
a
n
up'
commit
|
commitdiff
|
tree
2019-07-29
Junio C Ha
m
ano
Merg
e
branch 'jk/xd
i
ff-
c
lamp-funcname-conte
x
t-index'
commit
|
commitdiff
|
tree
2019-07-29
Ju
n
io C Hamano
Merge
b
r
anch 's
g
/
t
ravis-gcc-4
.
8'
commit
|
commitdiff
|
tree
2019-07-29
Junio C Hamano
Merge branch 'b
b
/grep
-
p
c
re2-bug-me
s
sag
e
-fix'
commit
|
commitdiff
|
tree
2019-07-29
J
unio C Hamano
Merge fixes made
on the 'master' fr
o
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2019-07-29
J
u
nio C Hamano
Merge branch 'jc/post-c89-rules-do
c
' into maint
commit
|
commitdiff
|
tree
2019-07-29
Jun
i
o
C Hamano
Merge branch
'
f
c/fetch-with-
i
mp
o
r
t-fix' i
n
to
m
aint
commit
|
commitdiff
|
tree
2019-07-29
Junio C Ham
a
no
Merge branch 'ds/close
-
object-store' int
o
main
t
commit
|
commitdiff
|
tree
next