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-ort: implement compare_pairs() and collect_renames()
2020-12-14
E
l
ijah
N
e
wren
m
e
r
ge-ort:
implement
compare_p
a
irs() and co
l
l
e
ct_renames()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
El
i
jah Newren
m
e
rge-
o
rt
:
implement detect_regular_
r
enames()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
merge-ort: add in
i
ti
a
l outline for basic ren
a
me
d
e
tection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
E
lijah Newren
me
r
ge
-
ort: add basic d
a
ta
structures for ha
n
dling renam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
me
r
ge-ort: add modif
y
/delete handling and delayed
o
utput
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add di
e
-not-implemented
s
tu
b
handle_content_me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
me
r
g
e-ort:
a
d
d functi
o
n grouping
comment
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newr
e
n
mer
g
e-ort: add
a
pat
h
s_to_fr
e
e field to merge_options_interna
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah Newren
m
e
r
g
e
-o
r
t: add
a path_conflic
t
fi
e
ld to merge_options
_
i
nternal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h Newren
m
erge-ort: add a
clear_internal_opts helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewren
merge-ort:
a
dd a few includes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-o
r
t:
f
ree data struct
u
res in merge_fin
a
lize()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h Newr
e
n
merge-ort
:
add impleme
n
tation of
record_co
n
f
l
icted_i
n
dex_ent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah Newren
tree: enable cmp_cache_name_compare() to
b
e
u
sed e
l
s
e
where
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add implementation o
f
c
h
ecko
u
t()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
i
jah
Newr
e
n
m
erge-ort:
ba
s
ic outline for merge_switch_to_result()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: step 3 of
tree writing -- handling 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 writ
i
ng
-
- function
t
o cre
a
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newre
n
merge-
o
r
t
:
s
tep
1 of tree
w
r
i
t
i
n
g
-
- rec
o
r
d
base
n
a
mes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
N
ewren
m
erge-ort
:
have p
r
o
c
ess_entri
e
s
opera
t
e i
n
a defined
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
merge-ort: add a prelimin
a
ry sim
p
l
e p
r
oc
e
ss_entries
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Ne
w
ren
merge-ort: avoi
d
r
ecursing into identical trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h
Newren
merge-ort: record
s
t
a
ge and auxiliary info
for
ev
e
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newr
e
n
merge
-
ort
:
compute a few mo
r
e useful fields for col
l
ec
t
_merg
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newre
n
merge-ort: av
o
id repe
a
ting fil
l
_tree_descriptor
(
) on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: implem
e
nt a very bas
i
c co
l
lect_merge_info()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add a
n
e
r
r() funct
i
on similar to one from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah Newren
merge-ort:
u
se histogram diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h N
e
wren
m
e
rge-ort: port
m
erg
e
_start() from mer
g
e-recursive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah N
e
wren
mer
g
e
-ort: add s
o
me high-level algorithm st
r
uc
t
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
me
r
ge-o
r
t:
s
etu
p
basic
in
t
ernal data struct
u
res
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-11
J
unio C
H
amano
Merg
e
bran
c
h 'e
n
/strmap
'
into en/merg
e
-ort-impl
commit
|
commitdiff
|
tree
2020-11-11
E
l
ijah Newr
e
n
shortl
o
g: use strse
t
from strma
p
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-11
E
l
i
j
ah Newren
Use
n
ew HA
S
HM
A
P_INIT mac
r
o
to simp
l
ify hashmap in
i
t
i
al
i
zati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-11
E
li
j
ah Newren
strmap: take
a
dvantage of
F
L
E
XPTR_ALL
O
C_STR when relevant
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-11
E
l
ijah Newren
strmap: enabl
e
a
lloca
t
ions to come from a
m
e
m
_
po
o
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-06
Eli
j
ah
N
ewren
strma
p
: add a strset su
b
-type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-06
Eli
j
a
h
Newren
strmap:
s
plit create_entry() out of strmap_put()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah
Newren
strmap:
a
dd functions facilitating use as a string
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah Newren
strmap: enable faster clearin
g
and r
e
using of strmap
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah
Newren
s
trmap: add more utility f
u
n
c
tio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-03
Elijah Newr
e
n
merge,rebase,revert: select
ort o
r
r
e
c
ursive by config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newren
strmap: new utility functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-02
E
l
ijah Newren
hashmap
:
provide dealloca
t
ion f
u
n
ction names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newren
hashm
a
p: introduce
a
new
h
ashmap_p
a
r
t
ial_clear
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-02
Eli
j
a
h New
r
e
n
hashma
p
: a
l
low re-use a
f
te
r
h
as
h
m
a
p_fre
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-11-02
Eli
j
ah Newren
hashmap: adjust sp
a
ci
n
g to f
i
x argument
al
i
gnmen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-29
Elijah New
r
e
n
f
ast-rebase: demonstra
t
e mer
g
e
-ort
'
s API vi
a
new test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-27
Elijah Ne
w
ren
merge-ort-wrap
p
ers:
new convience wrappers to mimic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-27
Elijah New
r
en
m
e
r
g
e-ort: barebones API of
n
ew merge
strateg
y
w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-22
Ju
n
i
o C Hama
n
o
S
y
nc with Git 2
.
2
9
.
1
commit
|
commitdiff
|
tree
2020-10-22
Ju
n
i
o
C Hamano
Git 2
.
29
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-22
Junio C Hamano
Me
r
ge br
a
nch 'js/n
o
-
b
uiltins
-
on
-
disk-option'
i
n
to maint
commit
|
commitdiff
|
tree
2020-10-21
Joha
n
nes Sc
h
in
d
e
l
in
SK
I
P_D
A
SHED_BUILT_INS:
d
o not skip the bin/ program
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-19
Ju
n
io C Hamano
Git
2
.
29
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-18
Junio C Hamano
Merge tag 'l10n-2
.
2
9
.
0
-
rnd2' of
git://github
.
com/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2020-10-17
Ju
n
i
o
C Ha
m
ano
Merge https://g
i
thub
.
com/prati010
0
/
git-gui
commit
|
commitdiff
|
tree
2020-10-15
Junio
C
Hamano
Git 2
.
29-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-13
Elijah Newren
h
a
shm
a
p: add usage
documentation explaining hashmap_free
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-09
Junio C Hamano
Git
2
.
29-rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-09
Junio C Hama
n
o
Merg
e
branch 'js/d
e
f
a
ult-
b
r
an
c
h-name-p
a
rt-3'
commit
|
commitdiff
|
tree
2020-10-09
Jun
i
o C H
a
man
o
Merge branch 'js/
c
i
-ghwf-dedu
p
-tests'
commit
|
commitdiff
|
tree
2020-10-09
Junio C
Ham
a
n
o
Merge branch 'ja/misc-doc-fixes'
commit
|
commitdiff
|
tree
2020-10-09
Junio C Hamano
Merge branch 'dl/makefile-
s
ort'
commit
|
commitdiff
|
tree
2020-10-09
Junio C
Hama
n
o
Mer
g
e
b
r
a
nch 'js/no-builtins-on-disk-option'
commit
|
commitdiff
|
tree
2020-10-09
Juni
o
C Ha
m
a
n
o
Merge
branch 'j
s
/ghwf-setup-msbuild-update'
commit
|
commitdiff
|
tree
2020-10-09
Junio C
Hamano
Merge branch 'jk/index-pack-hotfixe
s
'
commit
|
commitdiff
|
tree
2020-10-09
Junio
C
Hamano
Merge branch 'dl/
m
in
g
w-he
a
der-clean
u
p'
commit
|
commitdiff
|
tree
2020-10-09
Junio C Hamano
Mer
g
e
br
a
nch 'hx/push-atomic-with-ce
r
t'
commit
|
commitdiff
|
tree
2020-10-08
J
ean-Noël A
v
ila
doc: fix the bn
f
like sty
l
e of so
m
e com
m
ands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Jean-Noël Avila
doc: git-rem
o
te fix
ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Jean-
N
oël Avil
a
doc: use linkgit macro where neede
d
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Jean-Noël Avila
git-
b
isec
t
-lk2009:
make co
n
tinu
a
tion of list indent
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Johannes Sch
i
ndelin
ci: do not skip t
a
gged revisions in Gi
t
Hub
w
o
rk
f
lows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Johannes Schindelin
ci
:
skip GitHub workflow runs for already-tested commits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Johannes
S
chindeli
n
te
s
ts:
a
void
using t
h
e branch
n
ame `mai
n
`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Johan
n
es
S
chin
d
elin
t
1415: avo
i
d
using `
m
ain` as ref name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-08
Den
t
on L
i
u
Makefi
l
e: ASCII-sort += lists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-07
Johan
n
es Schindelin
help:
d
o
not expec
t
bui
l
t
-
i
n
comma
n
d
s to
b
e
har
d
l
in
k
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-07
Jo
n
at
h
an Tan
index-pac
k
: make
g
et_ba
s
e_data(
)
c
omment clearer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-07
J
e
ff King
i
n
dex-p
a
ck:
d
rop type_ca
s
m
u
t
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-07
Jeff Ki
n
g
ind
e
x-p
a
ck: rest
o
re "resolv
i
n
g
deltas" progr
e
ss m
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-07
Denton Liu
c
ompat/mingw
.
h: drop extern from
funct
i
on de
c
laration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-07
Johanne
s
Schindeli
n
GitHub workflo
w
: automati
c
ally follow minor updat
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 stdo
u
t and stderr
redirectio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-05
Ju
n
io
C Ha
m
ano
Git 2
.
29-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge branch
'nl/credentia
l
-crlf
'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Ha
m
a
no
Merge branch 'sn/f
a
s
t-import-doc'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge br
a
n
ch 'pb/submodule-doc-fix'
commit
|
commitdiff
|
tree
2020-10-05
Jun
i
o C Hamano
Merge br
a
nch 'jk/format-aut
o
-base-
w
he
n
-able
'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge branch 'jk/diff-cc-oidfind
-
fix'
commit
|
commitdiff
|
tree
2020-10-05
J
unio C Hamano
Merge branch 'jk/
r
efspecs
-
negative'
commit
|
commitdiff
|
tree
2020-10-05
Junio C H
a
mano
Mer
g
e
branch 'rs/archive-add-file
'
commit
|
commitdiff
|
tree
2020-10-05
Junio C
Haman
o
M
erge branch 'jt/keep-partial-clone-filter-upo
n
-lazy
.
.
.
commit
|
commitdiff
|
tree
2020-10-05
Junio C
H
a
mano
Merge
b
r
anch
'td/s
u
bmo
d
ule-upda
t
e-quiet'
commit
|
commitdiff
|
tree
2020-10-05
J
u
nio C Hamano
Merg
e
branch 'jk/unused'
commit
|
commitdiff
|
tree
2020-10-05
Junio C
H
a
mano
Merge
b
ranch 'js/cmake-vs'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge branch 'ma/wor
k
t
ree-cl
e
anups'
commit
|
commitdiff
|
tree
2020-10-05
J
u
nio C
H
amano
Merge branch '
s
o/combine-diff-simpli
f
y'
commit
|
commitdiff
|
tree
2020-10-05
Junio C Hamano
Merge branch '
j
s/de
f
ault-bra
n
ch
-
name-part-
2
'
commit
|
commitdiff
|
tree
next