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
rebase: add a config option for --no-fork-point
2020-12-18
Junio
C
H
amano
M
erge branch 'es/perf-export-fix'
commit
|
commitdiff
|
tree
2020-12-18
Junio C
Hama
n
o
Me
r
ge branch
'
rb/nonstop-
c
o
n
fig-mak-
u
name-update'
commit
|
commitdiff
|
tree
2020-12-18
Junio C Ha
m
ano
Merg
e
branch 'ab/unreacha
b
l
e
-
break'
commit
|
commitdiff
|
tree
2020-12-18
Junio C Haman
o
M
erge bran
c
h 'jc/
s
trmap-rem
o
ve-
t
y
p
e
fix'
commit
|
commitdiff
|
tree
2020-12-18
Ju
n
io
C Ham
a
no
Merge branch 'jc/compat-util-setitimer
-
fix'
commit
|
commitdiff
|
tree
2020-12-18
Junio C Ha
m
ano
M
erge branch 'dd/doc
-
p4-r
e
quirements-up
d
at
e
'
commit
|
commitdiff
|
tree
2020-12-18
Jun
i
o
C Ha
m
ano
M
erge branc
h
'js/in
i
t-d
e
f
a
ultbranch-ad
v
ice'
commit
|
commitdiff
|
tree
2020-12-18
Juni
o
C Hamano
M
erge
h
ttps://gi
t
hub
.
com/
p
rati0100/git-gui
commit
|
commitdiff
|
tree
2020-12-17
Junio C Hamano
A
nother batch before 2
.
30-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Junio C Hamano
Merge branch
'
jh/index-v2-doc-on-fsmn'
commit
|
commitdiff
|
tree
2020-12-17
Junio C Hamano
Merge branch 'jb/midx
-
doc-upd
a
te'
commit
|
commitdiff
|
tree
2020-12-17
Junio C Hamano
Me
r
ge branch 'r
j
/make-c
l
e
an
'
commit
|
commitdiff
|
tree
2020-12-17
Jun
i
o C Ham
a
no
Merge b
r
anc
h
'
j
s/
t
7064-m
a
ster-t
o
-initial'
commit
|
commitdiff
|
tree
2020-12-17
J
u
nio C Ha
m
ano
M
erg
e
br
a
nch 'js/
t
630
0
-hardc
o
de-mai
n
'
commit
|
commitdiff
|
tree
2020-12-17
Junio C Hama
n
o
Merge branch 'jk/oid-array-cl
e
anup'
commit
|
commitdiff
|
tree
2020-12-17
Junio C H
a
mano
Merge branch 'tb/pa
r
tial-clo
n
e-fil
t
ers-fix'
commit
|
commitdiff
|
tree
2020-12-17
Junio C Haman
o
M
e
rg
e
bran
c
h 'js/t7900-protect-p
w
d-in-config-g
e
t'
commit
|
commitdiff
|
tree
2020-12-17
Ra
n
dall
S
.
Bec
k
er
c
o
nfig
.
mak
.
uname
:
remove old Non
S
top compatibility
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Newren
me
r
g
e-o
r
t: impl
e
ment m
e
rge_incore_recursive()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
E
l
ijah N
e
wren
merge-ort: make clear_
i
nternal_opts() a
w
are of
p
artial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah
Newren
me
r
ge-or
t
:
c
o
p
y
a
f
e
w s
m
a
ll helper function
s
from mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Newren
commit: mo
v
e reverse_
c
ommit_l
i
st(
)
from me
r
ge
-
r
ec
u
r
s
i
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Jiang Xin
p
ack
-
redund
a
nt: fix crash when one packfile
in repo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johanne
s
S
c
h
indelin
tests: dro
p
the `PR
E
PARE_FOR_MA
I
N_BRANCH` prere
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Jo
h
a
nnes Schi
n
delin
t9902: use `main` a
s
init
i
al branc
h
n
a
me
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johannes Schindelin
t6302: use `main` as init
i
al
bra
n
ch
n
a
m
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johann
e
s Schindel
i
n
t570
3
: us
e
`main` as initial br
a
nch
n
a
m
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johannes Schindelin
t5510: use
`main` as init
i
a
l
branc
h
name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johannes Sc
h
indelin
t
5
5
05: finalize t
r
ansit
i
o
n
ing to using th
e
branch nam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johann
e
s Sc
h
i
n
d
elin
t3205: finalize tran
s
itioning to using the branch name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Joh
a
nnes S
c
hi
n
deli
n
t3203: complete the trans
i
tion
t
o u
s
i
n
g th
e
bra
n
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johannes S
c
hin
d
elin
t3201
:
f
inaliz
e
transitioning to
using
t
he branch n
a
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
J
o
hannes
Schin
d
elin
t32
0
0: finis
h
tra
n
siti
o
ni
n
g to th
e
initial branch name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johannes S
c
hindeli
n
t140
0
:
u
se `
m
ain` as initial b
r
anch nam
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Junio
C
Hamano
diff: cor
r
ect int
e
raction bet
w
een --ex
i
t-
c
ode a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-16
Eric
Sunshi
n
e
t
/perf: fix
t
est_export() fa
i
lure with B
S
D `se
d
`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-16
Felipe Contreras
p
u
ll: display default w
a
r
ning only
w
hen non-
f
f
Suggestions-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-16
Junio C Hamano
pull: correct condition to trigger non-ff
ad
v
i
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-16
Jun
i
o C Ham
a
no
pull: g
e
t rid o
f
unne
c
essary
global variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-16
Ævar A
r
n
f
jörð B
j
armason
style: d
o
n
o
t "break"
i
n
swit
c
h() after "return"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-15
Ju
n
io C Hama
n
o
com
p
at-
u
ti
l
:
p
r
et
e
nd that
s
t
ub setitimer() alway
s
s
ucce
e
ds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-15
Junio C Hamano
str
m
ap: make c
a
ll
e
rs
of strmap_remove(
)
to call it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
Đoàn Trần Công Da
n
h
d
oc: me
n
ti
o
n Python 3
.
x supports
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
Jun
i
o C H
a
man
o
Git 2
.
30-rc
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
Juni
o
C Hama
n
o
Merge branch
'js/t5
5
26
-
with-n
o
-par
t
icu
l
ar-p
r
imary-branc
h
.
.
.
commit
|
commitdiff
|
tree
2020-12-14
Junio C Hamano
Merge b
r
anch 'js/c
m
a
ke-extra-b
u
ilt-ins-fix'
commit
|
commitdiff
|
tree
2020-12-14
Junio C Hamano
M
erge branch 'da/vs-build-ic
o
n
v
-fix
'
commit
|
commitdiff
|
tree
2020-12-14
J
u
nio
C
H
a
mano
Merge branch 'jk/multi-lin
e
-ind
e
nt-style-fix'
commit
|
commitdiff
|
tree
2020-12-14
Ju
n
io C Hamano
Merge bran
c
h 'jk/check-config-
p
arsing-error-in-
u
pload
.
.
.
commit
|
commitdiff
|
tree
2020-12-14
J
unio C Hamano
Merge b
r
anch '
a
e/d
o
c
-reprod
u
cible-html'
commit
|
commitdiff
|
tree
2020-12-14
Junio C Hamano
Me
r
ge branch 'so/
g
lo
s
sary-branch-
i
s-
n
ot-necessarily
.
.
.
commit
|
commitdiff
|
tree
2020-12-14
Ju
n
io
C Hama
n
o
Mer
g
e branch 'fc/atmark-in-refspec'
commit
|
commitdiff
|
tree
2020-12-14
Junio C Hama
n
o
Merge branc
h
'
d
d/help-autocorrect-neve
r
'
commit
|
commitdiff
|
tree
2020-12-14
Felipe
C
on
t
reras
pull: give the
a
dvice
f
or choosing rebase/mer
g
e much
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
Felipe C
o
ntreras
p
u
ll: refactor
fas
t
-forward c
h
eck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
Jeff
Hostetler
index-format
.
txt: documen
t
v2 format of file sy
s
tem
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
Johan
n
e
s
B
erg
docs: mu
l
ti-pack-index: remo
v
e n
o
te about future 'veri
f
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Johan
n
es
S
chindelin
init: pr
o
vid
e
usef
u
l advice
a
bout init
.
d
e
faultBranc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Jo
h
ann
e
s Sc
h
inde
l
in
get
_
defa
u
l
t
_branch_name(): prepare for sh
o
w
ing some
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Johannes
S
c
hindelin
branch -m: allow r
e
n
am
i
ng
a
yet-unb
o
r
n
branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Johanne
s
Sch
i
ndel
i
n
init: d
o
c
u
ment `init
.
defaultBranch` be
t
ter
Initial-patch-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
erge-ort: add
modify/
d
elet
e
han
d
ling and delaye
d
output
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah N
e
wren
merge-o
r
t: add die-not-impl
e
mented stub
h
andle_co
n
tent_merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Newren
merge
-
ort: add function grouping
c
omments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add a
paths_to_free
f
i
e
l
d
to merge_op
t
i
o
ns_i
n
ternal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-o
r
t: add a path_conflict field to merge_o
p
tions
_
i
ntern
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
e
rge-ort: add
a
clear_internal_opts helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
e
rge-
o
r
t
: add a few includes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
merge-ort: free
d
at
a
structu
r
es in merge_fi
n
alize()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add implementation of rec
o
rd_confli
c
t
ed_index_
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
i
jah Newren
t
ree:
enable cmp_cache_
n
ame
_
compar
e
() to b
e
u
sed elsew
h
ere
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
e
rge-
o
rt: add
imp
l
ementation of c
h
eckout()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah New
r
en
merge-o
r
t: b
a
s
i
c
o
u
tline for
merg
e
_swi
t
ch_
t
o_
r
es
u
lt()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h
N
ewren
merge
-
ort: s
t
e
p 3
o
f
tree
wri
t
ing -- handl
i
ng subdirectories
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newre
n
merg
e
-ort: st
e
p 2 of tree writing -- function to
cre
a
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Ne
w
ren
me
r
ge-ort: step 1 of tree wri
t
ing -
-
record b
a
se
n
ames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
merge-ort: h
a
ve process_e
n
tries operat
e
in a define
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah New
r
en
merge
-
ort
:
add a pre
l
i
m
inary simp
l
e process_
e
n
tries
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h Newren
merge-ort: avoi
d
recurs
i
ng into ident
i
ca
l
trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: r
e
cord stage and auxil
i
ary info for eve
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: compute a few m
o
re useful
f
i
elds
for coll
e
ct_mer
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Newren
me
r
ge-ort
:
avo
i
d repe
a
ti
n
g
f
ill_tree
_
d
e
s
criptor()
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ija
h
N
e
w
r
en
merge-
o
rt:
implement a ve
r
y basic collect_me
r
ge_info()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
ja
h
N
e
wren
mer
g
e-or
t
: add an e
r
r() f
u
nction s
i
mila
r
to
one
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: use histogram diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newr
e
n
me
r
g
e-o
r
t: port
m
erge_sta
r
t()
f
ro
m
merge
-
recursive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewren
merge
-
ort:
add som
e
h
igh-level algorithm structure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah Newren
merg
e
-ort:
setu
p
bas
i
c int
e
rnal data str
u
ctures
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
b
r
i
a
n m
.
carls
o
n
rev-pars
e
: add o
p
tion for
absolute
o
r
relative path
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
br
i
an m
.
c
a
r
lson
a
b
s
p
ath: add a funct
i
on to reso
l
ve paths with missing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-10
J
osh Steadm
o
n
t
7
9
00: u
s
e -
-
fi
x
ed-value in git-maintenance tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Æva
r
Arnfjörð Bjarm
a
son
pretty format %(
t
railers):
a
dd a "key_value_separato
r
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Ævar Arnfjörð B
j
armason
prett
y
format %(trailers):
a
d
d a "
k
eyonly"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Ævar Arn
f
j
ö
rð Bjarmason
pretty-format
%
(trailers):
fix broken standalo
n
e "valueonly"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Æ
v
a
r
Arnfjö
r
ð
B
j
arma
s
on
pre
t
ty forma
t
%(trailers) doc: avo
i
d repetition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Pe
t
er Ka
e
stle
s
u
bmodules: fix
o
f re
g
ressi
o
n on fetching of non-
i
ni
t
.
.
.
CC:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Ramsay J
o
nes
M
a
kefile: do
n
't
u
se a versioned
t
emp distributio
n
di
r
e
ctory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Ramsay Jones
Makefile: don't try to
cl
e
an
old debi
a
n build
p
r
o
duct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Ramsay Jones
gitwe
b
/Makef
i
le: con
d
i
tio
n
a
l
ly include
.
.
/GIT-VERS
I
ON
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Ramsay Jones
Document
a
tion/Make
f
ile: conditionally i
n
clude
.
.
/GIT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next