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 branch 'en/merge-strategy-docs' into maint
2021-10-12
Junio C Haman
o
Merge bran
c
h
'
en/
m
erge-str
a
tegy-docs' into maint
commit
|
commitdiff
|
tree
2021-10-12
Junio C Hamano
Me
r
g
e
b
ranch
'ab/bundle-d
o
c' into maint
commit
|
commitdiff
|
tree
2021-08-16
Junio C Ham
a
no
Git
2
.
33
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-16
J
un
i
o
C
Hamano
Me
r
g
e
bran
c
h 'rs/
o
idtree-alignment-fix'
commit
|
commitdiff
|
tree
2021-08-16
J
unio C H
a
mano
Merge tag 'l10n-
2
.
33
.
0-
r
nd2' of g
i
t
:
//gith
u
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2021-08-15
René Scharfe
oi
d
tree: av
o
i
d
unaligned
a
cces
s
to crit-bi
t
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-11
Junio C Hamano
G
i
t 2
.
33-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-11
Junio
C Hamano
Merge b
r
an
c
h '
j
n/log-m-
d
oes-no
t
-impl
y
-p'
commit
|
commitdiff
|
tree
2021-08-11
Junio C Hamano
Mer
g
e
bra
n
ch 'cb/many-alt
e
rnate-optim-f
i
x
u
p
'
commit
|
commitdiff
|
tree
2021-08-11
R
ené
Scharfe
object-f
i
le:
u
se u
n
sig
n
e
d arithmeti
c
wit
h
bit m
a
sk
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-09
Jonathan Nie
d
e
r
Reve
r
t 'diff-
m
erg
e
s: let "-m" imply "-p"'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-09
Carlo Marcelo Aren
a
s
.
.
.
ob
j
ect-s
t
or
e
: a
v
oi
d
ex
t
r
a
';'
f
r
om KHASH_INIT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-09
Carlo Marcelo
A
renas
.
.
.
oi
d
tre
e
: avoid ne
s
ted struct
oidtree_node
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-06
J
u
n
i
o C
Hamano
Git 2
.
33-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-06
Jun
i
o C
H
amano
Merge branch 'cb/t7508-re
g
e
xp-fi
x
'
commit
|
commitdiff
|
tree
2021-08-06
J
u
nio C Ham
a
no
Merg
e
branch 'ab/
p
ic
k
axe-pcr
e
2
'
commit
|
commitdiff
|
tree
2021-08-06
J
u
nio C Hamano
Merge branch 'fc/dis
a
bl
e
-check
w
in
s
ize'
commit
|
commitdiff
|
tree
2021-08-06
F
e
lipe Co
n
treras
te
s
t:
f
ix for COL
U
MNS and bash 5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Ne
w
ren
Upd
a
te erro
r
mess
a
ge and code
com
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-05
Elija
h
Newren
merge-strat
e
gies
.
tx
t
:
add
c
over
a
ge of the `ort` me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ijah Newren
git
-
rebase
.
txt
:
corre
c
t o
u
t-of-d
a
te and
misleading
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
merge-stra
t
egies
.
txt: fix simple ca
p
i
t
a
lization e
r
ror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah N
e
wren
mer
g
e-strategies
.
t
xt: avoid giving
special
preference
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah New
r
en
merge-strategies
.
txt:
d
o not imply using
c
o
p
y
detection
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ijah
Newren
merge-strategies
.
txt: u
p
date wording
f
or the
resolve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ijah Newren
D
o
c
u
me
n
t
a
t
i
on: e
d
it awkward re
f
erences to `git m
e
r
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
ah
Newre
n
d
i
rectory-ren
a
me-d
e
tection
.
txt: small
u
pdate
s
due
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah N
e
wren
git-rebase
.
txt: cor
r
e
c
t antiquate
d
cla
i
ms
about --
r
ebase
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-04
Ju
n
io C
H
amano
T
h
e
eigh
t
h batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-04
Junio C Hamano
Merge branch '
t
b
/
m
i
ng
w
-r
m
dir-symlink-to-directory
'
commit
|
commitdiff
|
tree
2021-08-04
Jun
i
o C Hamano
Me
r
ge
branch 'ar/doc
-
markup-f
i
x'
commit
|
commitdiff
|
tree
2021-08-04
Junio C Hamano
Merge branch
'ab/get
c
wd-test'
commit
|
commitdiff
|
tree
2021-08-04
Junio C Hamano
Merge branch 'rs/use-fs
p
at
h
h
ash'
commit
|
commitdiff
|
tree
2021-08-04
Jun
i
o C Hamano
Me
r
ge br
a
nch 'pb/m
e
rge-auto
s
tash-more'
commit
|
commitdiff
|
tree
2021-08-04
Junio C Haman
o
Merge branch 'en/ort-perf-batc
h
-14'
commit
|
commitdiff
|
tree
2021-08-04
Junio C Hamano
Me
r
ge branch 'ds/
c
ommit-and-
c
heckout-wit
h
-sparse-index'
commit
|
commitdiff
|
tree
2021-08-04
Junio C H
a
mano
M
e
r
g
e
branch
'ab/upda
t
e-submi
t
tin
g
-patche
s
'
commit
|
commitdiff
|
tree
2021-08-04
Jun
i
o
C Hamano
Merge branch
'ah/plugleaks'
commit
|
commitdiff
|
tree
2021-08-04
Ju
n
io
C
H
a
m
a
no
Merge branch 'ar/submodule-add'
commit
|
commitdiff
|
tree
2021-08-04
Bagas Sanjaya
diff: -
-
p
ickaxe-all
t
y
p
o
fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-02
Thomas Bétous
mingw
:
align
s
ymlinks-r
e
lated
r
mdir() behavior with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-02
Ca
r
lo Marce
l
o Arenas
.
.
.
t75
0
8: avoid non POSIX BRE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-02
Æva
r
Arnfjör
ð
Bjarmason
bundle do
c
: replace "basis"
with "prereq
u
site(s)
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-02
Æv
a
r Arnfjö
r
ð Bjar
m
ason
bundle
d
oc
:
elaborate on rev<->ref restriction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-02
Ævar Ar
n
fjörð
Bj
a
rmas
o
n
bundle doc: elaborate o
n
o
bject prere
q
uis
i
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-02
Ævar Arnfjörð Bjarmas
o
n
bundle doc: rewrite the "D
E
S
C
R
I
PTION" section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-02
Junio
C
Ham
a
no
Git 2
.
33-r
c
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-08-02
Junio C Hamano
Merge branch 'jk/check-
p
ack-valid-before-opening-bitmap'
commit
|
commitdiff
|
tree
2021-08-02
Junio C
H
amano
M
erge branch
'
jt/bulk-pref
e
tch'
commit
|
commitdiff
|
tree
2021-08-02
Junio C Hamano
M
erg
e
branch
'
fc/pull-no-rebase-merg
e
s-t
h
ei
r
s-into
.
.
.
commit
|
commitdiff
|
tree
2021-08-02
Juni
o
C Hamano
M
erge branch 'ab/bundle-tests'
commit
|
commitdiff
|
tree
2021-08-02
Junio C
H
aman
o
M
erge bran
c
h 'ps/perf-
w
ith-separate-o
u
tput-dir
e
cto
r
y'
commit
|
commitdiff
|
tree
2021-08-02
Junio C H
a
m
ano
Merge br
a
nch 'j
s
/
c
i-
c
hec
k
-whitespace-updates'
commit
|
commitdiff
|
tree
2021-08-02
J
u
nio C Hamano
Merge branch 'jk/config-env-
d
o
c'
commit
|
commitdiff
|
tree
2021-08-02
Junio
C
Hamano
Merge branch 'pb
/
submo
d
ul
e
-recurse-doc'
commit
|
commitdiff
|
tree
2021-08-02
Jun
i
o C
H
a
m
a
no
M
e
rge branch 'tb/bitmap-type-
f
i
lter-comment-fi
x
'
commit
|
commitdiff
|
tree
2021-07-30
René Sc
h
arfe
use f
s
p
a
thhash() everywhere
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-30
Ævar A
r
nfjörð B
j
armas
o
n
t
000
1
: fix
b
r
oken not-
q
u
ite getcwd(3)
t
est in bed6787
4
e2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-30
An
d
r
ei Rybak
Documentati
o
n
: render s
p
ecial characters correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-28
Junio C H
a
mano
The sev
e
nth ba
t
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-28
Junio C Hamano
Merge b
r
a
n
ch
'ps/t0000-output-directory-fix'
commit
|
commitdiff
|
tree
2021-07-28
Junio
C
Hamano
Mer
g
e
b
ranc
h
'
t
b/reverse-midx'
commit
|
commitdiff
|
tree
2021-07-28
Junio C Hamano
Merge
b
ranch 'hn/refs-debug-empt
y
-
prefi
x
'
commit
|
commitdiff
|
tree
2021-07-28
Jun
i
o C
Hamano
Merge branch 'pb/dont-complete-alias
e
d-optio
n
s
'
commit
|
commitdiff
|
tree
2021-07-28
Junio C Hamano
Merg
e
branch 'en/renam
e
-lim
i
ts
-
do
c
'
commit
|
commitdiff
|
tree
2021-07-28
J
uni
o
C Hamano
M
er
g
e branch 'ds
/
gender-neutral-do
c
-
g
uideline
s
'
commit
|
commitdiff
|
tree
2021-07-28
Junio C H
a
mano
Me
r
ge br
a
nch 'd
s
/status-with-spars
e
-index'
commit
|
commitdiff
|
tree
2021-07-28
Junio C Haman
o
Merg
e
b
ranc
h
'js/
c
i-make-sparse'
commit
|
commitdiff
|
tree
2021-07-28
J
unio C Hamano
Merge b
r
anch 'ab/pkt-line-
t
e
sts'
commit
|
commitdiff
|
tree
2021-07-28
Ju
n
io C Hamano
Merge bran
c
h 'jk
/
t000
0
-subte
s
ts-fix'
commit
|
commitdiff
|
tree
2021-07-28
Junio C
H
a
mano
Me
r
ge b
r
a
n
ch 'dl/dif
f
-merge
-
base'
commit
|
commitdiff
|
tree
2021-07-28
Juni
o
C Hamano
Merge
b
ranch 'ab
/
a
ttribute-format'
commit
|
commitdiff
|
tree
2021-07-28
Junio
C
H
ama
n
o
Merg
e
branch 'jk/log
-
d
e
corate-optim'
commit
|
commitdiff
|
tree
2021-07-28
Junio
C Ham
a
no
Merge
branch 's
m
/
worktree-add-lock'
commit
|
commitdiff
|
tree
2021-07-28
Junio C Hamano
Merge bran
c
h 'ew/many-
a
lt
e
r
n
ate-opti
m
'
commit
|
commitdiff
|
tree
2021-07-28
Junio C Hama
n
o
Merge branch 'hj/commit-allow-empty
-
messag
e
'
commit
|
commitdiff
|
tree
2021-07-28
Juni
o
C Haman
o
M
erge
b
r
a
nch 'dl/packet-read-response-e
n
d-fix'
commit
|
commitdiff
|
tree
2021-07-26
J
e
ff King
ci/inst
a
ll-depend
e
n
cies: handl
e
"sparse" job p
a
ckage
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
Jeff King
ci
:
run "
a
pt-get update"
before
"
apt-ge
t
i
nstall"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
An
d
rzej
Hunt
r
eset: clear_unpack
_
tr
e
e
s
_por
c
el
a
in to plug
leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
Andrzej Hunt
built
i
n/rebase
:
fi
x
options
.
strate
g
y memory lifecycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
Andr
z
ej Hunt
bu
i
ltin/merge: free fo
u
nd_ref when done
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
Andrzej Hunt
bui
l
t
in/mv: free or UNL
E
AK multiple poin
t
er
s
a
t end
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
Andr
z
e
j Hunt
convert
:
rel
e
a
s
e
strbuf to
avo
i
d leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
Andrz
e
j Hunt
read-cac
h
e: call diff_
s
etup_don
e
t
o avo
i
d leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
A
n
drzej Hunt
r
e
f-f
i
lter: a
l
so fre
e
he
a
d
f
o
r
ATOM_HEA
D
to avo
i
d leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
Andrzej Hunt
d
i
ffcore-re
n
a
me: move
o
ld
_
di
r
/new_di
r
definition to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
Andrz
e
j H
u
nt
bui
l
tin/for-each-rep
o
: remove unnecessary argv copy
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
Andrzej Hu
n
t
b
ui
l
t
i
n
/
su
b
module--helper: releas
e
unus
e
d
s
t
r
buf t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
Andrzej Hunt
enviro
n
ment: mov
e
s
t
rbuf into block to p
l
u
g leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
Andrzej
H
u
n
t
fmt-merge-msg: free newly
a
llocated tem
p
o
rary
strings
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-26
Jeff Kin
g
subm
o
d
ule:
d
rop unused sm_name parameter from show_f
e
tch_
r
em
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-23
Phil
i
pp
e
Bla
i
n
merge: ap
p
ly autost
a
sh if merge str
a
tegy f
a
i
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-23
Phil
i
p
pe Blain
merge: apply au
t
o
stash if fa
s
t
-forward fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-23
Philippe Blain
D
ocumentation: define 'MERGE_A
U
TOS
T
ASH'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-23
Philippe Blain
merge
:
add
m
is
s
ing
w
ord "
s
t
rategy" to
a message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-23
Jonathan Tan
cach
e
-tr
e
e: prefe
t
ch in partial cl
o
n
e r
e
ad-t
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-23
Jonathan T
a
n
u
n
pack-tre
e
s:
r
efactor pr
e
fetch
i
ng code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-23
J
eff King
pack-b
i
t
m
ap: ch
e
c
k
p
a
ck va
l
idity w
h
en opening bitma
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-22
Ævar Arnfjörð B
j
armason
bundle tests: use
t
est_cmp ins
t
e
ad of
grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next