repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-ort: make clear_internal_opts() aware of partial clearing
2020-12-17
Eli
j
ah
N
ewren
merg
e
-ort: make
c
lear_internal_opts() aware of partial
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-17
Elijah
N
ewren
merge-or
t
:
c
opy
a
f
ew small helper
functions f
r
om merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-17
Eli
j
a
h
Newren
commit
:
move rev
e
r
s
e_
c
o
m
mit_list()
fr
o
m m
e
rge-
r
ecursive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add modify/delet
e
handling an
d
del
a
yed
out
p
ut
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah Newren
merge-ort: add die
-
not-implemented stub handle_content_mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
me
r
ge-ort: a
d
d function
grouping comments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah N
e
wren
merge-ort: add a path
s
_
t
o_free fi
e
ld
to merg
e
_
op
t
ions_inte
r
nal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
e
r
g
e-or
t
:
a
dd a p
a
th
_
c
onflict field to
merge_o
p
ti
o
ns_inte
r
nal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah Newren
merge-
o
rt: add a
clear_internal_opts h
e
l
pe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add a
few includes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah N
e
wren
merge
-
ort: free data struc
t
ures
i
n me
r
ge_finalize()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add implementation of re
c
ord_c
o
nflict
e
d_index_e
n
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah New
r
e
n
t
ree: e
n
able cmp_cache_name_compare() to
b
e used elsewhere
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
El
i
j
ah N
e
wren
merge-
o
r
t
: add im
p
lem
e
ntation of checkout(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah Newren
m
e
r
g
e-ort: basic ou
t
line for m
e
r
g
e_switch
_
t
o
_
r
esult()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
merge
-
ort:
step 3 of tree w
r
it
i
n
g
--
handling subdi
r
e
c
tories
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
erg
e
-
ort:
s
t
ep 2 of tree writing
-- function
t
o creat
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merg
e
-ort:
s
tep 1 of t
r
ee w
r
iting -- record basenames
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah Newren
merge-ort
:
have p
r
ocess_e
n
tries o
p
erate in a defined
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
E
lij
a
h
Newren
mer
g
e
-
ort: add a p
r
eliminary simp
l
e pr
o
cess_entries
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah Newren
m
erge-ort: avoi
d
recursing into identica
l
tree
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newre
n
mer
g
e-or
t
: record stage and aux
i
liary inf
o
for every
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah Newren
merge-
o
r
t
: compute a
fe
w
more useful fields
f
or co
l
l
e
ct_merg
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
merge-ort
:
a
v
oid r
e
pe
a
ting fill_t
r
ee_descriptor() on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: impl
e
ment
a
ver
y
basic
c
ollect
_
merge_info()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
mer
g
e-ort: a
d
d an e
r
r
(
) function similar
t
o
o
n
e
f
r
o
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h N
e
wren
merge-ort: use histogram diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newre
n
m
erge-ort:
port merge
_
start
(
) from mer
g
e
-
r
ecurs
i
v
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
New
r
en
merge-
o
rt: add some hi
g
h-level
a
lgorit
h
m
structure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
e
rg
e
-ort: s
e
tu
p
b
a
sic internal data s
t
ru
c
t
ur
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-11
Junio C Hamano
Merg
e
branch
'
en/strmap' into en/merge-ort-
i
m
p
l
commit
|
commitdiff
|
tree
2020-11-11
Elij
a
h Newren
shortlog:
use
s
trse
t
from s
t
r
m
ap
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newren
Use new
HASHMAP_
I
NIT macro to simplify
h
ashmap initialization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-11
Elijah
Newren
st
r
m
ap: tak
e
advant
a
ge of FLE
X
PTR_ALLOC_STR
w
hen rele
v
ant
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-11
E
lijah N
e
wr
e
n
st
r
map: enab
l
e allocations to come from a mem_pool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-06
E
lijah Newren
strmap: ad
d
a strset sub-type
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-06
Elijah N
e
wren
strmap: split create_entr
y
() ou
t
of st
r
m
ap_put()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-05
E
lijah Newren
strmap:
a
dd functions fa
c
ili
t
a
t
ing use as a string
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-05
Elijah N
e
w
re
n
strmap: enable
faster clearing an
d
reus
i
ng of
s
tr
m
a
p
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-05
Elijah Newren
s
t
r
map: add more utility functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-03
El
i
jah
Newren
merge,re
b
ase,r
e
vert: select
ort or recursive
by config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-02
Elija
h
Newren
s
t
rmap: new utili
t
y func
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newr
e
n
has
h
m
ap: p
r
ovide
deallocation
f
un
c
tion names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Ne
w
ren
hashmap: i
n
trod
u
ce a
n
ew hashm
a
p_par
t
i
a
l_c
l
e
ar(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-02
Elija
h
Newren
hash
m
ap:
allow re-use af
t
er hashmap_free()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-02
Elijah
N
ewren
hashmap
:
adjust sp
a
c
i
ng to f
i
x argument align
m
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-29
El
i
j
ah Newr
e
n
fast-reb
a
se: demonstrate merge-ort's
A
PI
v
i
a
new test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-27
Elijah Newr
e
n
m
e
rge-o
r
t-wrappe
r
s: new c
o
n
v
i
e
n
c
e
wrappers to m
i
mic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-27
Elijah Newren
merge
-
ort
:
barebo
n
e
s
API
o
f
new merge st
r
ategy with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-22
Junio C H
a
m
a
no
Sync with Git 2
.
29
.
1
commit
|
commitdiff
|
tree
2020-10-22
J
u
nio C Hamano
Git
2
.
29
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-22
Junio C
Haman
o
Merge
bra
n
c
h
'j
s
/no-b
u
iltins-on-dis
k
-o
p
t
ion' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2020-10-21
Johann
e
s
S
chinde
l
i
n
S
K
IP_DAS
H
E
D
_
BUI
L
T_INS: do not skip the bin/ pr
o
gram
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-19
J
u
nio C Hamano
Git
2
.
29
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-18
Juni
o
C
H
amano
Merge tag 'l10n-2
.
29
.
0-rnd2' of git:/
/
github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2020-10-17
Junio C Ha
m
ano
Merge https
:
//gi
t
hub
.
com/prati01
0
0/git
-
gui
commit
|
commitdiff
|
tree
2020-10-15
Juni
o
C Ha
m
an
o
Git 2
.
2
9-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-13
E
l
i
j
ah N
e
wren
hashmap: add usage d
o
cumentation e
x
pl
a
ining hashmap
_
free
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-09
Jun
i
o C H
a
m
a
no
Git 2
.
29
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-09
Junio C Hamano
Merge br
a
n
ch 'js/d
e
fau
l
t-branch-name-
p
art-3
'
commit
|
commitdiff
|
tree
2020-10-09
Junio C Hamano
Merge branch
'js/ci
-
gh
w
f-d
e
d
u
p-tests'
commit
|
commitdiff
|
tree
2020-10-09
Ju
n
i
o C Hamano
Merge
branch
'ja/misc-doc-fixe
s
'
commit
|
commitdiff
|
tree
2020-10-09
Junio C Haman
o
M
erge bra
n
ch 'dl/
m
akefile-sort'
commit
|
commitdiff
|
tree
2020-10-09
J
unio C
Hamano
Merge
b
ranch 'js/no-builtins-
o
n
-
d
i
sk-opt
i
on'
commit
|
commitdiff
|
tree
2020-10-09
Junio C H
a
m
ano
Merge branch 'js
/
ghw
f
-se
t
up-msbuil
d
-update'
commit
|
commitdiff
|
tree
2020-10-09
J
u
nio
C Ha
m
ano
Merge b
r
a
nch 'jk/index-pac
k
-h
o
tfix
e
s'
commit
|
commitdiff
|
tree
2020-10-09
Junio C Ham
a
no
M
e
r
g
e branc
h
'dl/
m
ing
w
-head
e
r-cleanup'
commit
|
commitdiff
|
tree
2020-10-09
Junio
C Ha
m
ano
Merge bran
c
h
'
hx/push-atomic-with-cert'
commit
|
commitdiff
|
tree
2020-10-08
Jean-Noël Avila
doc:
f
ix the bn
f
l
i
ke style o
f
some c
o
mmands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Jean
-
Noël Avil
a
doc
:
g
it-rem
o
te fix ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Jean-Noël Avila
doc: use
linkgit macr
o
wh
e
re ne
e
d
e
d
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Je
a
n-No
ë
l Avila
git-bisect-lk2
0
0
9
: m
a
ke conti
n
u
ation of
list
i
nd
e
nted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Johannes Schindelin
ci: do no
t
skip
t
agged revisions
in GitHub workflow
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Johannes Schindel
i
n
ci: ski
p
GitH
u
b workflow ru
n
s for alre
a
dy-tes
t
ed commi
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
J
o
hannes Schindelin
tests: avoid using the branch name `main`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Johannes Schindeli
n
t1415: avoid usi
n
g `mai
n
` as ref
n
ame
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Dent
o
n Liu
Makefile: A
S
CII-sort +
=
lists
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-07
Joha
n
nes Sch
i
ndelin
help: do
n
ot
e
x
pec
t
bui
l
t-i
n
com
m
a
n
d
s
t
o
be har
d
linked
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-07
Jonathan Tan
index-pack:
make ge
t
_
base_dat
a
() comment clearer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-07
J
e
f
f
King
index-pack:
drop type_c
a
s
m
u
tex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-07
Jeff K
i
ng
index-pack: re
s
tore
"resolving delt
a
s" pro
g
ress m
e
ter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-07
Denton L
i
u
compat/
m
ingw
.
h
:
d
r
op ext
e
rn from function decla
r
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-07
Joh
a
nnes Schindel
i
n
GitHub workfl
o
w:
a
utomati
c
ally follow minor updates
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-06
Đ
oàn Trần C
ô
ng Danh
t5534:
s
plit stdo
u
t
and st
d
err redirection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-05
Junio C Ham
a
no
Gi
t
2
.
29-rc
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge branch 'nl/
c
redential-
c
rlf'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge branc
h
'sn/fast-import-doc'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge branc
h
'
p
b
/su
b
module-do
c
-fix'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge bra
n
ch 'jk/format-
a
uto-b
a
se-when-able'
commit
|
commitdiff
|
tree
2020-10-05
Junio
C Haman
o
Merge branch
'
jk/diff-cc
-
oidfind-fix'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge
branch 'jk/refspec
s
-nega
t
ive'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hama
n
o
Merge bra
n
ch 'rs/archive-add-file
'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Me
r
ge br
a
n
ch 'jt/keep-partial-clone
-
filte
r
-upon-lazy
.
.
.
commit
|
commitdiff
|
tree
2020-10-05
Ju
n
io C H
a
m
a
n
o
Merge b
r
anc
h
'td/sub
m
o
d
u
l
e
-update-
q
ui
e
t'
commit
|
commitdiff
|
tree
2020-10-05
Junio
C Hamano
Merge branc
h
'jk/
u
nuse
d
'
commit
|
commitdiff
|
tree
2020-10-05
Jun
i
o C Hamano
Mer
g
e branch 'js/cmake-vs'
commit
|
commitdiff
|
tree
2020-10-05
J
u
n
i
o C Hamano
M
erg
e
branch 'ma/w
o
r
ktree-cleanups'
commit
|
commitdiff
|
tree
2020-10-05
Ju
n
io C Hamano
Merge bra
n
ch 'so/comb
i
ne-di
f
f-sim
p
l
if
y
'
commit
|
commitdiff
|
tree
2020-10-05
Ju
n
io C Hamano
Merge branch 'js/d
e
f
ault-branch-name-part-2'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge branch 'pm/gitk-update'
commit
|
commitdiff
|
tree
next