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
El
i
jah Newren
merge-ort: add a few include
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newre
n
merge-ort: f
r
ee data structures
in merge_final
i
z
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
merge-o
r
t: add impleme
n
tation
of record_conflicted_in
d
e
x
_ent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
tree: ena
b
le cmp_cach
e
_name_compare(
)
t
o
be used e
l
s
e
w
h
ere
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
e
rge-or
t
:
a
dd i
m
plementation
o
f
checkout()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
m
erge-ort:
basic outline for merge_switch_to_result()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newre
n
merge-ort: st
e
p
3 of
t
r
ee writ
i
n
g -- ha
n
dling subdir
e
ctor
i
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
mer
g
e-ort:
st
e
p 2 o
f
tree writing -- function to create
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Ne
w
ren
merge-ort: step
1 of tree writin
g
--
r
ecord basen
a
mes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
merge-ort:
ha
v
e pro
c
ess_entri
e
s operate in
a
defined
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newre
n
merge-ort: add a
preliminar
y
s
i
mple
p
r
o
cess_
e
ntries
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newre
n
merge-or
t
: avo
i
d recur
s
i
ng into i
d
e
ntical trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah Ne
w
ren
mer
g
e-ort: record
s
tage and
a
ux
i
liary info
for every
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
a
h
Newren
merge-ort:
c
ompu
t
e
a few
more useful fields for
c
ollect_merg
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newre
n
me
r
ge-ort: avo
i
d repe
a
ting fill_tree
_
d
es
c
riptor() on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h Newren
merge-
o
r
t
: imp
l
em
e
nt a very b
a
sic collect_m
e
rge_info()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah New
r
e
n
merge-ort: ad
d
an err
(
) function similar to one f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merg
e
-ort:
use
h
isto
g
r
a
m
diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort:
port
merge_
s
tart(
)
from
mer
g
e
-
recursive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah
N
ewren
merge-ort: a
d
d some high-leve
l
algorithm st
r
uc
t
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: setup ba
s
ic internal data
s
tru
c
ture
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-11
J
u
nio
C
H
amano
M
e
rge bran
c
h
'en/st
r
map'
into en
/
merge-o
r
t-impl
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newren
sho
r
t
l
og:
u
se strs
e
t from str
m
a
p
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-11
Elija
h
N
ewren
Use new
HASHMAP_INIT macro
to simplify hashmap
initialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-11
El
i
j
ah Newren
s
t
rmap: take
advanta
g
e o
f
FLEXPTR
_
ALL
O
C_STR w
h
en
r
eleva
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-11
El
i
ja
h
Ne
w
ren
strmap: enable allocati
o
ns to co
m
e from a mem_pool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-06
E
l
i
jah
Newren
strmap
:
a
dd a strset sub-
t
ype
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-06
Elijah Newren
strmap:
s
plit cre
a
te_en
t
ry() out of strmap_put(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-05
Elij
a
h Newren
strmap
:
a
d
d
func
t
i
ons facilita
t
ing use as
a str
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah Newr
e
n
strma
p
: enable fast
e
r clearing and
r
eusing of strmaps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah Newren
strmap:
a
dd more utility functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-03
Elijah
N
e
w
r
en
m
erge,rebase,revert: select ort or recursive by
c
o
n
f
i
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah N
e
wren
strmap:
n
ew utility f
u
nctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-02
El
i
jah Newren
ha
s
hmap: prov
i
de
dea
l
l
o
c
ation
f
uncti
o
n nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newren
hashmap: int
r
oduce
a new hashma
p
_p
a
r
ti
a
l_clear()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-02
El
i
jah Newren
hashmap: allow r
e
-use aft
e
r hashmap_free
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newren
hashmap
:
ad
j
ust
spacing to fix
a
rg
u
men
t
alig
n
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-29
Elijah
Newren
fast-rebase: demons
t
rate merge
-
ort's API vi
a
new
test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-27
E
li
j
ah
New
r
en
mer
g
e-o
r
t-wr
a
p
p
ers: new convience wrappers
to
mimic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-27
Eli
j
ah
N
ewr
e
n
merg
e
-ort
:
b
a
rebones API
of new merge strategy with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-22
Junio C
Hamano
Sync w
i
th Git 2
.
29
.
1
commit
|
commitdiff
|
tree
2020-10-22
Junio C
H
aman
o
Git 2
.
29
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-22
Junio
C Hamano
Merg
e
b
r
a
n
ch 'js/no-builtins
-
on
-
disk
-
option'
into maint
commit
|
commitdiff
|
tree
2020-10-21
Johann
e
s
S
c
hinde
l
in
SKIP_DASHE
D
_BUILT_INS: do no
t
skip the
b
in/ prog
r
ams
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-19
Junio C Ha
m
ano
Git 2
.
29
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-18
J
unio C
Hamano
Merge t
a
g 'l10n-2
.
2
9
.
0-rn
d
2' of
git
:
/
/github
.
c
om/git
.
.
.
commit
|
commitdiff
|
tree
2020-10-17
J
u
ni
o
C H
a
mano
Merge
h
ttps
:
/
/github
.
com
/
prati0100/git-gui
commit
|
commitdiff
|
tree
2020-10-15
Junio C Hama
n
o
Git 2
.
29-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-13
E
li
j
ah Ne
w
ren
h
a
shmap:
a
d
d
usage doc
u
mentation
e
xpla
i
ning hashmap_free
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-09
Junio
C
Ham
a
n
o
Git
2
.
29-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-09
Junio C Hamano
M
erge
b
ranch 'js
/
d
efa
u
lt
-
branch-name-part-3'
commit
|
commitdiff
|
tree
2020-10-09
Junio C
Hamano
M
erge branch 'js/ci-ghwf-dedup-tests'
commit
|
commitdiff
|
tree
2020-10-09
J
u
n
io C Hamano
Merge bran
c
h 'j
a
/misc-doc-fixes
'
commit
|
commitdiff
|
tree
2020-10-09
Junio C
H
a
m
ano
Merge branch
'
dl/m
a
kefile-sort'
commit
|
commitdiff
|
tree
2020-10-09
Junio C Ham
a
n
o
Merge
bra
n
ch 'js/no-bui
l
t
i
ns-on-d
i
s
k
-op
t
ion'
commit
|
commitdiff
|
tree
2020-10-09
Junio C H
a
mano
M
er
g
e branch
'js/ghwf-setu
p
-msbuil
d
-update'
commit
|
commitdiff
|
tree
2020-10-09
Junio C Ham
a
n
o
M
e
r
ge branch
'
j
k
/index-pack-ho
t
fixe
s
'
commit
|
commitdiff
|
tree
2020-10-09
Junio C Ham
a
no
Merge bra
n
c
h
'dl/
m
ingw-h
e
ader-cleanup'
commit
|
commitdiff
|
tree
2020-10-09
Junio
C Hama
n
o
Merge branch 'hx/pus
h
-atomic-with-cert'
commit
|
commitdiff
|
tree
2020-10-08
Jean-Noël Avila
d
oc: fix t
h
e bn
f
l
i
ke style of
some c
o
mman
d
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Jea
n
-Noë
l
Avi
l
a
doc: git-remote fi
x
ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
J
e
an-N
o
ël Avila
d
oc: use linkgit
macro w
h
ere ne
e
ded
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Jean-No
ë
l
A
vila
git-bisect-lk2
0
09
:
m
a
k
e
continuatio
n
of list indented
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
J
o
hannes
Schindelin
c
i: do no
t
skip tagged revision
s
in G
i
tHub wor
k
flows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Joha
n
nes Sc
h
i
ndelin
ci
:
sk
i
p
GitH
u
b
workflo
w
r
uns for a
l
rea
d
y-tes
t
ed
c
o
m
mits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
J
ohan
n
es S
c
hindelin
tests: avoid usi
n
g the
b
ranch name `main`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Jo
h
ann
e
s
Schindelin
t14
1
5: avoid using `main` as ref name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Den
t
on Liu
Makefile: ASCII
-
sort += list
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-07
Johan
n
es Schindelin
help:
do no
t
expect built
-
in commands
to be hard
l
in
k
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-07
Jo
n
athan Ta
n
in
d
ex-p
a
ck: mak
e
get_
b
ase_d
a
ta
(
)
co
m
ment clearer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-07
Jeff King
i
ndex-pack: drop type_cas mutex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-07
Jef
f
K
i
ng
index-p
a
c
k: restore "resolving
d
eltas
"
progress meter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-07
Denton
L
iu
compat/mingw
.
h: dr
o
p exter
n
from function d
e
claration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-07
J
o
h
annes Schindelin
GitHub workflo
w
:
au
t
omatically follo
w
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: split stdout and s
t
de
r
r red
i
rec
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Gi
t
2
.
29-
r
c0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge branch 'nl/c
r
ede
n
tial-crlf'
commit
|
commitdiff
|
tree
2020-10-05
Junio C
Haman
o
Merge
b
r
a
nch 'sn/fast-imp
o
rt-doc'
commit
|
commitdiff
|
tree
2020-10-05
J
unio C
H
a
mano
Merge branch
'
pb
/
sub
m
odu
l
e-doc-fix'
commit
|
commitdiff
|
tree
2020-10-05
J
unio C Hama
n
o
Merge branch 'jk/format-au
t
o
-bas
e
-when-a
b
le'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Ham
a
no
Mer
g
e
b
r
a
nch 'j
k
/diff
-
c
c-oidfind-f
i
x
'
commit
|
commitdiff
|
tree
2020-10-05
Junio C
H
ama
n
o
Merg
e
branch 'jk
/
refspecs-negative'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
M
e
rge
b
ranch 'rs/archive-add-
f
ile
'
commit
|
commitdiff
|
tree
2020-10-05
Junio C
H
ama
n
o
Merge branch
'jt
/
keep-p
a
rtial-clone-filter-upo
n
-la
z
y
.
.
.
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge br
a
nch 't
d
/submodule-upd
a
te-quiet'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge
b
ranch 'jk/un
u
sed'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
M
e
r
g
e branch 'js/cmak
e
-vs'
commit
|
commitdiff
|
tree
2020-10-05
J
unio C Hamano
Merge branch 'ma/
w
or
k
tree-cle
a
nups'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge bra
n
ch '
s
o/combin
e
-diff-simplify
'
commit
|
commitdiff
|
tree
2020-10-05
Junio C
Hamano
Merge bran
c
h '
j
s
/
default-bran
c
h-nam
e
-part
-
2'
commit
|
commitdiff
|
tree
2020-10-05
Junio
C Hamano
Me
r
ge branch 'pm/gitk
-
update'
commit
|
commitdiff
|
tree
2020-10-05
Ju
n
io
C Ham
a
no
Mer
g
e
b
ranc
h
'ds/i
n
-merge-bases-many-op
t
im-bu
g
'
commit
|
commitdiff
|
tree
2020-10-04
S
a
manta N
a
varro
f
ast-imp
o
rt: fix typo in
d
ocu
m
en
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-04
Ph
i
lippe
Blain
gitsubmodules doc: invoke
'l
s
-f
i
les' wit
h
'--
r
ecurse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-04
Junio
C Ha
m
a
n
o
Nin
e
t
e
enth batc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-04
J
uni
o
C Hamano
Me
r
ge
b
ra
n
ch
'
m
t/delta-base-cache-races'
commit
|
commitdiff
|
tree
2020-10-04
Junio C Hamano
Merge branc
h
'jk/shortlog-group-by-trailer'
commit
|
commitdiff
|
tree
2020-10-04
Junio C Hamano
Merge b
r
anch '
j
c/fmt-merge-msg-
s
up
p
ress
-
destinatio
n
'
commit
|
commitdiff
|
tree
2020-10-04
Junio C
H
amano
Merge bra
n
ch 'tb/upload-pa
c
k
-
fi
l
ters'
commit
|
commitdiff
|
tree
2020-10-04
Junio C Hamano
Me
r
ge b
r
anch 'j
c
/sequ
e
ncer-stopped-sha
-
simplify'
commit
|
commitdiff
|
tree
next