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
Juni
o
C Hamano
Merg
e
b
ra
n
ch 'en/merge
-
s
tra
t
egy-do
c
s' into m
a
int
commit
|
commitdiff
|
tree
2021-10-12
Junio C Hamano
Me
r
ge branch 'ab/bun
d
le-
d
o
c' into maint
commit
|
commitdiff
|
tree
2021-08-16
Junio C H
a
mano
Git
2
.
33
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-16
Junio C Hamano
Merge
b
ranch 'rs/oidtr
e
e-alignment-fix'
commit
|
commitdiff
|
tree
2021-08-16
Junio
C
H
amano
Merge tag '
l
1
0
n
-
2
.
33
.
0
-
r
nd2'
o
f
git:/
/
g
ithub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2021-08-15
Re
n
é Scharfe
oidtr
e
e: avoid
u
nali
g
ned acce
s
s to c
r
it-bit tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-11
Juni
o
C Hamano
Git 2
.
33-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-11
Junio C Hamano
Mer
g
e bran
c
h 'jn/log-m-doe
s
-not-imply-
p
'
commit
|
commitdiff
|
tree
2021-08-11
Junio
C Ham
a
no
Merge branch 'cb
/
many-alternate-optim-fixup
'
commit
|
commitdiff
|
tree
2021-08-11
R
ené Scharfe
object-file: use unsi
g
ned arithmetic with bit mask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-09
J
o
nathan N
i
eder
Rev
e
rt 'diff-m
e
rge
s
: let "-m" impl
y
"-p"'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-09
Carlo Marcelo Arena
s
.
.
.
obj
e
ct-store: avoid extra ';' from KHAS
H
_
I
NIT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-09
C
arlo
Mar
c
elo Arenas
.
.
.
oid
t
ree: avoid
nes
t
ed struct oid
t
ree
_
node
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-06
Junio
C
Hamano
G
it
2
.
33-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-06
Jun
i
o C Hama
n
o
Merge branch 'cb/t7508-rege
x
p-fix'
commit
|
commitdiff
|
tree
2021-08-06
Junio C Hamano
Me
r
ge branch 'a
b
/pickaxe-pcre2'
commit
|
commitdiff
|
tree
2021-08-06
Ju
n
io C Hamano
Merge
b
ranch 'fc/disabl
e
-
c
heckwinsize'
commit
|
commitdiff
|
tree
2021-08-06
F
e
lip
e
Contreras
test: fix for COLUM
N
S and ba
s
h 5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-05
E
l
i
jah Ne
w
ren
Update er
r
or mess
a
ge and code
c
om
m
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elij
a
h Newren
merge-strat
e
gies
.
t
x
t: add cover
a
ge of
t
he
`ort`
m
erg
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
g
i
t-re
b
ase
.
t
x
t: co
r
rect out-of-date and misleading
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elija
h
Ne
w
ren
mer
g
e-strategies
.
t
x
t:
f
ix si
m
ple capitalizati
o
n error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elij
a
h New
r
en
m
erge-strategies
.
txt: avoid giving special pre
f
erence
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
merge-
s
tr
a
tegies
.
txt: do not i
m
p
l
y using copy dete
c
t
i
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newr
e
n
m
erge-str
a
tegies
.
t
x
t: update
w
o
rding for th
e
res
o
lv
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
Doc
u
mentation: edit awkward ref
e
rences to `git merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-05
E
lijah Newren
direc
t
ory-rename-d
e
tection
.
txt
:
small updates due to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
ah
N
ewren
git-reb
a
se
.
txt: cor
r
ec
t
an
t
iq
u
a
t
e
d cl
a
ims about --rebase
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-04
Juni
o
C Hamano
The eighth b
a
tch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-04
Junio C Hama
n
o
Merge
b
ranch
'
t
b
/mingw-r
m
dir-symlink-to-directo
r
y'
commit
|
commitdiff
|
tree
2021-08-04
J
unio
C
Hamano
Merge b
r
anch 'ar/doc-markup-f
i
x'
commit
|
commitdiff
|
tree
2021-08-04
Junio C Hamano
Mer
g
e branch 'ab/
g
etcwd-tes
t
'
commit
|
commitdiff
|
tree
2021-08-04
Junio C Hamano
Mer
g
e branch 'rs/u
s
e
-fspathhash'
commit
|
commitdiff
|
tree
2021-08-04
Junio C Hama
n
o
Merge branc
h
'pb/merge-autostash-more'
commit
|
commitdiff
|
tree
2021-08-04
Junio C Haman
o
Me
r
ge
branch 'en/
o
r
t
-perf-ba
t
ch-14'
commit
|
commitdiff
|
tree
2021-08-04
Junio C Haman
o
M
e
rge
branch 'ds/commit-and-
c
heckout-wit
h
-spar
s
e
-
inde
x
'
commit
|
commitdiff
|
tree
2021-08-04
Junio
C
Hama
n
o
M
erge b
r
anch 'ab
/
update
-
submitting
-
patches'
commit
|
commitdiff
|
tree
2021-08-04
Junio C Hama
n
o
Merge
branch
'
ah
/
plu
g
lea
k
s'
commit
|
commitdiff
|
tree
2021-08-04
Jun
i
o C Ham
a
no
Merge branc
h
'ar
/
su
b
module-ad
d
'
commit
|
commitdiff
|
tree
2021-08-04
Bag
a
s
S
anjaya
diff:
--pickaxe
-
all
typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-02
Thomas Bétou
s
mingw: alig
n
syml
i
nks-related r
m
d
ir()
b
ehavior with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-02
Carlo Marcelo Arenas
.
.
.
t7508: avoid
non POSIX
BRE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-02
Ævar
A
rnfjörð Bjar
m
ason
bundle doc:
r
eplace "basis" with "p
r
erequsite(s)"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-02
Ævar Arnfjörð Bjarmason
bund
l
e doc: elaborat
e
o
n
r
e
v<
-
>ref
restric
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-02
Æv
a
r Arn
f
jörð Bjarm
a
son
bund
l
e
doc: elaborate on o
b
ject prerequis
i
tes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-02
Ævar
Arnfjörð Bjarmason
bundle do
c
: rewrite the "DESCRIP
T
ION" section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-02
J
u
nio C Hamano
Git
2
.
33-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-08-02
Junio C Hamano
M
e
rg
e
br
a
nch 'jk/check
-
pac
k
-
v
alid-befor
e
-openi
n
g-bitmap
'
commit
|
commitdiff
|
tree
2021-08-02
Junio C
Hamano
Me
r
ge
b
r
anch 'jt/bulk
-
pr
e
fetch'
commit
|
commitdiff
|
tree
2021-08-02
Junio
C
H
a
mano
Me
r
g
e branch 'fc/
p
ull
-
n
o
-reba
s
e-mer
g
e
s
-theirs-into
.
.
.
commit
|
commitdiff
|
tree
2021-08-02
Ju
n
i
o C Hamano
Me
r
ge branch 'ab/b
u
nd
l
e-t
e
sts
'
commit
|
commitdiff
|
tree
2021-08-02
Junio C Hamano
Merge branc
h
'ps/pe
r
f
-with
-
separate-out
p
u
t
-directory'
commit
|
commitdiff
|
tree
2021-08-02
Jun
i
o C Ha
m
ano
Merge
branch 'j
s
/ci-check
-
whit
e
space-u
p
dates'
commit
|
commitdiff
|
tree
2021-08-02
J
u
n
i
o
C
Ha
m
a
no
Me
r
ge branch
'jk/config-e
n
v
-doc'
commit
|
commitdiff
|
tree
2021-08-02
Ju
n
io
C
Hamano
Merge branch 'pb/sub
m
odule-re
c
u
rse-
d
o
c
'
commit
|
commitdiff
|
tree
2021-08-02
J
u
nio C Hamano
Me
r
g
e branc
h
'
tb/bitmap-type
-
filter-c
o
m
m
ent-f
i
x'
commit
|
commitdiff
|
tree
2021-07-30
Re
n
é Sch
a
r
f
e
use fsp
a
thh
a
sh() e
v
erywhere
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-30
Ævar Arnfjör
ð
Bjarm
a
son
t0001: fix broken not-quite getcwd(
3
) test in
b
e
d
67874e2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-30
Andrei
R
yba
k
Documentat
i
on: ren
d
e
r
special
c
haracters cor
r
ectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-28
J
u
nio C Haman
o
T
h
e sevent
h
batc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-28
Junio
C
Hamano
Me
r
g
e
branch 'ps/t0000-o
u
tput-direct
o
ry-
f
ix'
commit
|
commitdiff
|
tree
2021-07-28
Junio C Hamano
M
erge b
r
a
n
ch 'tb/reverse-midx'
commit
|
commitdiff
|
tree
2021-07-28
Junio C Ha
m
an
o
Merge branch '
h
n/refs-debug-empty-prefix'
commit
|
commitdiff
|
tree
2021-07-28
Junio
C
Hamano
M
e
r
g
e branch 'pb/dont
-
comp
l
ete-a
l
iased-option
s
'
commit
|
commitdiff
|
tree
2021-07-28
Junio C Hamano
Merge branch
'en/renam
e
-
limits-doc'
commit
|
commitdiff
|
tree
2021-07-28
J
u
nio C Ha
m
ano
Merge branch
'
d
s/gend
e
r-
n
eutral-
d
o
c
-guid
e
lines'
commit
|
commitdiff
|
tree
2021-07-28
Junio
C
H
amano
Mer
g
e branch
'
ds/sta
t
u
s
-with-sparse-index
'
commit
|
commitdiff
|
tree
2021-07-28
Junio C
H
a
m
ano
Merge branch 'js/ci-make-spa
r
s
e
'
commit
|
commitdiff
|
tree
2021-07-28
Ju
n
io C Hamano
Merge branch 'ab
/
pkt-
l
ine-
t
ests'
commit
|
commitdiff
|
tree
2021-07-28
Junio C Hamano
Merge
b
ranch 'jk/t0000-subtest
s
-fix
'
commit
|
commitdiff
|
tree
2021-07-28
Junio C
Hamano
Merg
e
branch '
d
l/diff-me
r
ge-base'
commit
|
commitdiff
|
tree
2021-07-28
Junio C Hamano
Merge branc
h
'ab/attri
b
ute-for
m
at'
commit
|
commitdiff
|
tree
2021-07-28
Junio C Ha
m
ano
Merge b
r
anch 'jk/
l
og-decora
t
e-op
t
i
m
'
commit
|
commitdiff
|
tree
2021-07-28
Junio C
Ham
a
no
Merge branch 'sm/worktree-a
d
d-lock'
commit
|
commitdiff
|
tree
2021-07-28
Juni
o
C Hamano
Me
r
ge
branch 'ew/many-alternate-optim'
commit
|
commitdiff
|
tree
2021-07-28
J
unio C Hamano
Merge branch 'h
j
/
c
ommi
t
-allow-empty-message'
commit
|
commitdiff
|
tree
2021-07-28
Jun
i
o C
H
amano
Merge br
a
nch 'd
l
/packe
t
-read-r
e
spo
n
se
-
end-fix'
commit
|
commitdiff
|
tree
2021-07-26
Jeff King
c
i
/ins
t
all-dependencies: handl
e
"
s
parse" job
packa
g
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
Jeff King
ci: run "apt-get update" befo
r
e
"apt-get
install"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
And
r
zej Hunt
reset
:
clear_unpack_tree
s
_po
r
celain to plu
g
leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
Andrzej Hunt
bui
l
ti
n
/rebase:
f
ix options
.
stra
t
egy memory lifecy
c
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
Andrzej Hunt
builtin/merge
:
f
r
ee found_r
e
f
w
h
e
n done
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
Andrzej H
u
nt
b
uiltin/mv: free or
U
NLEAK multi
p
l
e
p
ointers at end
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
Andrzej Hunt
c
o
nvert: release
strbuf to avoid le
a
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
Andrzej H
u
nt
read
-
cache: call d
i
ff_
s
etup_
d
on
e
to av
o
id leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
And
r
zej Hunt
ref-filter: also free head for ATOM
_
HEAD to
a
void leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
An
d
r
z
ej Hunt
diffc
o
r
e
-rename: move ol
d
_dir/new_dir de
f
initio
n
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
Andrzej H
u
nt
builtin/for-eac
h
-repo: remove
unnecessary argv copy
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
Andr
z
e
j Hunt
b
u
iltin/submodu
l
e--help
e
r
: release unused s
t
rbuf
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
An
d
rzej Hu
n
t
env
i
ronme
n
t: move strbuf into blo
c
k to plug leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
A
n
drz
e
j H
u
nt
fmt-merge
-
msg: free
n
e
w
ly alloc
a
te
d
temporary string
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-26
Jeff King
submod
u
le: dro
p
un
u
sed sm_name parameter fr
o
m sh
o
w
_
fetc
h
_rem
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-23
Philippe Bl
a
in
merge: apply a
u
t
ostash i
f
merge
strategy fails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-23
Philip
p
e Blain
merge: apply au
t
osta
s
h
if
f
ast-
f
o
r
w
a
r
d
f
ails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-23
Phil
i
ppe Blain
Docu
m
enta
t
ion:
d
efine 'MERG
E
_AUTOS
T
ASH'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-23
Phili
p
pe Blain
m
e
rge: ad
d
m
i
ssing wo
r
d
"strategy" to a messag
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-23
J
o
nathan Tan
ca
c
he-tree: prefetc
h
in p
a
rtial clone read-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-23
J
ona
t
han Tan
unpack-trees: refactor prefet
c
hi
n
g cod
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-23
J
eff King
pack-bitma
p
:
c
heck pack validi
t
y wh
e
n
o
p
ening bitm
a
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-07-22
Ævar Arnfjör
ð
Bjarmas
o
n
bundle tests: use
t
es
t
_cmp instead of grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next