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: add a few includes
2020-12-13
Elija
h
Newren
m
e
rge-or
t
: add a
few in
c
ludes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah N
e
wren
merge
-
ort: free da
t
a structures in merge_finaliz
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merg
e
-o
r
t: add implementation of recor
d
_conflicted_
i
ndex_ent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
tr
e
e: enable cmp_cache_name_com
p
are
(
)
to be
used elsewhere
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add implementation of checkout()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
mer
g
e
-
or
t
: basic outline for merge_switch_to_res
u
lt()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
me
r
ge-o
r
t: step 3 of tr
e
e writing
-- ha
n
dling subdirectories
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: step
2
o
f tree w
r
itin
g
-
-
function to create
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah N
e
wren
merge-ort: step 1 of tree writing -- record basenames
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah New
r
en
m
e
rge-ort: have process_entries ope
r
ate
i
n a defin
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Ne
w
ren
me
r
ge-ort
:
add a prelimina
r
y simple
p
roces
s
_entries
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort
:
avoid recursing into identic
a
l trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
merge-ort
:
reco
r
d
st
a
ge and
a
uxilia
r
y
inf
o
f
or ev
e
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Newre
n
m
e
rge-
o
r
t:
com
p
ute a few
m
o
r
e useful f
i
elds for c
o
lle
c
t
_mer
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah Newren
mer
g
e-ort:
avoid repea
t
ing f
i
ll_tree_descriptor() on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah New
r
en
m
erge-ort
:
implement a very
b
asic collect_merge
_
inf
o
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah Newren
merge-ort: add an er
r
() function similar to one from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
me
r
ge-ort: use histog
r
am diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-o
r
t: port merge_start() from merge
-
r
ecursive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
e
r
ge-ort:
a
dd some high-
l
evel algorit
h
m structur
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort
:
s
e
tup basic internal d
a
ta st
r
uctu
r
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-11
J
unio C H
a
mano
Merge
branch 'en/str
m
ap' into en/merge-ort-
i
mpl
commit
|
commitdiff
|
tree
2020-11-11
Elijah
N
e
wren
s
hortlog:
u
s
e strset from strmap
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-11
Elijah New
r
e
n
Use ne
w
HAS
H
MAP_INIT macro to simpl
i
f
y hashmap ini
t
ialization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-11
E
lijah Newren
strmap: ta
k
e
advan
t
age of F
L
EXPTR
_
ALLOC_STR when
re
l
evant
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newr
e
n
s
t
rmap: enable allocations
to com
e
fro
m
a mem_pool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-06
Elijah Ne
w
r
e
n
strmap: add a strset sub-
t
yp
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-06
Elijah Newr
e
n
strmap
:
split crea
t
e_e
n
try() out of strmap_put()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-05
Elijah Ne
w
r
e
n
str
m
a
p
: a
d
d
f
unctions facilitating
u
se
as
a
s
tring
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-05
Elij
a
h Newren
st
r
m
a
p:
en
a
b
l
e f
a
ster
c
learin
g
an
d
reu
s
i
ng o
f
s
trmaps
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-05
Eli
j
ah Newren
s
trm
a
p
:
add more utility fun
c
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-03
E
l
ijah
N
e
wren
merge,reba
s
e
,
reve
r
t: select ort
o
r
recur
s
ive by config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-02
El
i
jah Newre
n
strmap: new utility fu
n
cti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newren
hashmap: provide dealloca
t
i
on
fun
c
ti
o
n names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Ne
w
ren
h
ashmap: introduce a
n
e
w hashmap_part
i
al_clear()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-02
El
i
jah Newren
h
a
s
hmap:
a
llow re-use after
h
a
s
hmap_fre
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newren
hashmap: ad
j
ust
s
pacing to fix
a
r
gument
alignment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-29
Elijah Ne
w
ren
fast-rebase: dem
o
n
strate
merge-ort's API via
n
ew t
e
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-27
Elijah
Newren
mer
g
e-o
r
t-wrappers: new c
o
nvience wra
p
p
ers
t
o mimic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-27
Elijah Newren
merge-ort:
b
arebones API of new merge
strat
e
gy
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-22
Junio C Hamano
S
ync with G
i
t
2
.
29
.
1
commit
|
commitdiff
|
tree
2020-10-22
Junio
C Hama
n
o
Git 2
.
29
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-22
Junio C Ha
m
a
n
o
Merge branch 'j
s
/
n
o
-builtins-
o
n-disk-option' into ma
i
nt
commit
|
commitdiff
|
tree
2020-10-21
J
o
hannes Schindelin
SKIP_
D
A
S
HED_BUILT_INS: d
o
not skip the
b
in
/
p
r
ograms
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-19
Junio
C
Haman
o
Git 2
.
2
9
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-18
Junio C Hamano
Mer
g
e tag 'l10n
-
2
.
29
.
0-rnd2' o
f
g
i
t:/
/
github
.
c
om/git
.
.
.
commit
|
commitdiff
|
tree
2020-10-17
Junio C Hamano
Merge https://github
.
c
o
m/
p
r
a
ti0100
/
git-gui
commit
|
commitdiff
|
tree
2020-10-15
Jun
i
o C Hamano
Gi
t
2
.
29-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-13
E
l
ijah Newren
hashm
a
p: add usage docum
e
n
t
ation
e
xplai
n
in
g
hashma
p
_free
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-09
Juni
o
C Ha
m
an
o
Git 2
.
29-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-09
J
unio
C Hamano
Me
r
g
e branch 'js/
d
efault-
b
ranch-n
a
me-part-3'
commit
|
commitdiff
|
tree
2020-10-09
Junio C Hamano
Merge bran
c
h
'js/ci-ghwf-dedup-tests'
commit
|
commitdiff
|
tree
2020-10-09
Jun
i
o
C
Hamano
Merge branch 'ja/mi
s
c-doc-fixes'
commit
|
commitdiff
|
tree
2020-10-09
Ju
n
i
o
C Hamano
Merge
b
ran
c
h 'dl/makefile-sort'
commit
|
commitdiff
|
tree
2020-10-09
Junio
C
Hamano
Merge branch 'js/no-builtins-on-
d
is
k
-opt
i
on'
commit
|
commitdiff
|
tree
2020-10-09
J
unio
C Hamano
Merg
e
b
r
anch 'js/ghwf-setup-msbuild-u
p
date'
commit
|
commitdiff
|
tree
2020-10-09
Junio C Hamano
M
erge bran
c
h 'jk/index-pack-hotfixes'
commit
|
commitdiff
|
tree
2020-10-09
Ju
n
i
o
C Ha
m
an
o
Merg
e
branch 'dl/ming
w
-
h
ea
d
er
-
cleanup'
commit
|
commitdiff
|
tree
2020-10-09
Junio C Hamano
Merg
e
branch 'hx/
p
ush-a
t
omic-w
i
th-
c
ert'
commit
|
commitdiff
|
tree
2020-10-08
J
ean-No
ë
l
A
v
i
la
doc: fi
x
the
b
n
f
l
i
k
e
style of som
e
commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Jean
-
Noël Avila
doc: git-remote fix ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Jean-
N
o
ël Avila
doc: use l
i
nkgit m
a
cro wh
e
re needed
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
J
ean-
N
oël
Avila
git
-
bisect-lk2009: ma
k
e continua
t
i
on of l
i
s
t
indent
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Joh
a
nnes Schindel
i
n
ci: do
no
t
skip ta
g
ge
d
revisions in GitHub wo
r
kflows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Johannes Sch
i
ndeli
n
ci:
s
kip
G
itHub workflow r
u
ns for
already-te
s
ted commit
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Johannes Sc
h
i
ndelin
t
e
sts: avoid
u
sin
g
the branch n
a
me `main
`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Johannes
S
c
hindeli
n
t1415: avoid using `main` as
r
ef
n
ame
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-08
Denton Liu
Makefile: AS
C
II-sort +=
l
ist
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-07
Johannes Schindelin
help
:
d
o
not expect
b
u
i
lt-in commands to be
h
ardlinked
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-07
Jonathan Tan
index-pack: make
get_base_data() comment clearer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-07
Jeff King
index-pack: drop typ
e
_cas mut
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-07
Jeff K
i
ng
in
d
ex-pack: re
s
tore "resolving delt
a
s
" progres
s
met
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-07
D
enton
Liu
co
m
pat/m
i
n
g
w
.
h
:
drop extern from function declaration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-07
Jo
h
annes Schindeli
n
GitH
u
b wo
r
kflow: autom
a
tically follow minor upda
t
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-06
Đoàn Trần Công Danh
t5534: split stdou
t
and stder
r
r
e
direct
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-05
Ju
n
io
C Hama
n
o
Git 2
.
29
-
rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge b
r
a
nch 'nl/credential-crlf'
commit
|
commitdiff
|
tree
2020-10-05
Junio C H
a
mano
Merge branch '
s
n/fast-
i
mport-doc'
commit
|
commitdiff
|
tree
2020-10-05
Ju
n
io C Hamano
Me
r
g
e
b
r
anch 'p
b
/submodule-
d
o
c-fi
x
'
commit
|
commitdiff
|
tree
2020-10-05
J
unio C Hama
n
o
Merge
branch
'jk/for
m
a
t-auto-base-when-able'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Ham
a
no
Merge branch 'jk/diff-cc-oidfin
d
-
f
i
x
'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hama
n
o
Merge branc
h
'jk/refspecs-negative'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Ha
m
an
o
Merge branch 'rs/archive-ad
d
-file'
commit
|
commitdiff
|
tree
2020-10-05
Ju
n
io C
H
amano
Merge branc
h
'jt/keep-p
a
rti
a
l-clone-fil
t
er-upon
-
l
azy
.
.
.
commit
|
commitdiff
|
tree
2020-10-05
Junio C Ha
m
a
no
Me
r
g
e
bran
c
h 'td/subm
o
du
l
e-update-qu
i
et'
commit
|
commitdiff
|
tree
2020-10-05
Junio
C
Hamano
Merge b
r
anch 'jk/unu
s
ed'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Me
r
ge b
r
anch
'js/cmake-vs'
commit
|
commitdiff
|
tree
2020-10-05
Ju
n
io C Ha
m
ano
Merg
e
b
ranch 'm
a
/
worktree-cleanups'
commit
|
commitdiff
|
tree
2020-10-05
J
u
n
i
o C
H
am
a
n
o
M
erge br
a
nch 's
o
/comb
i
ne-diff-simplify'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
M
e
r
ge branch 'js/default-branch
-
name-part-2'
commit
|
commitdiff
|
tree
2020-10-05
Juni
o
C
Hamano
Mer
g
e branch 'pm/git
k
-
update'
commit
|
commitdiff
|
tree
2020-10-05
Junio C H
a
mano
Merge bran
c
h 'ds/in-merge-bases-many-optim-bug'
commit
|
commitdiff
|
tree
2020-10-04
S
ama
n
ta Navarro
fast-
i
mp
o
rt: fix typo
in docum
e
ntation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-04
P
hilippe Blai
n
gi
t
submodules
d
o
c
: in
v
oke 'ls
-
files
'
wit
h
'--r
e
curse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-04
Juni
o
C Hamano
Ninete
e
n
t
h batc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2020-10-04
Junio C H
a
mano
Mer
g
e branc
h
'mt/delta-
b
a
s
e-cache
-
races'
commit
|
commitdiff
|
tree
2020-10-04
Juni
o
C Ha
m
ano
Merge branch 'jk/
s
hortlog
-
group-by-traile
r
'
commit
|
commitdiff
|
tree
2020-10-04
Junio
C
Hamano
M
e
rge b
r
a
nch
'
jc/fmt-
m
erge-msg-suppr
e
ss-destination'
commit
|
commitdiff
|
tree
2020-10-04
Junio C Hama
n
o
Merge branch 'tb/upload-pack-filters'
commit
|
commitdiff
|
tree
2020-10-04
Ju
n
io C Ha
m
ano
M
erge branch '
j
c/seq
u
e
n
cer-stopped
-
sha-
s
impl
i
fy'
commit
|
commitdiff
|
tree
next