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
fetch-pack: with packfile URIs, use index-pack arg
2020-12-18
J
u
n
io
C
Hama
n
o
Gi
t
2
.
30-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-18
Junio C Haman
o
Merge
branch
'jc
/
diff-I-
s
tatus-fix'
commit
|
commitdiff
|
tree
2020-12-18
Junio C H
a
m
ano
Merge branch 'es/perf-ex
p
ort-fix'
commit
|
commitdiff
|
tree
2020-12-18
J
unio C H
a
ma
n
o
Merge branch 'rb/non
s
top-conf
i
g-
m
ak-unam
e
-update'
commit
|
commitdiff
|
tree
2020-12-18
Ju
n
io C
Ham
a
no
Merge branch
'
ab/
u
nrea
c
hable-break'
commit
|
commitdiff
|
tree
2020-12-18
Junio C Hamano
Mer
g
e
branch 'jc/strmap-remove-typefix'
commit
|
commitdiff
|
tree
2020-12-18
Juni
o
C Hamano
M
e
rge bran
c
h 'jc/co
m
pat-
u
til-
s
e
t
itime
r
-fix'
commit
|
commitdiff
|
tree
2020-12-18
Junio
C Hamano
M
erge branch
'
dd/doc-p
4
-requirements-update'
commit
|
commitdiff
|
tree
2020-12-18
Junio C Hamano
Mer
g
e b
r
anch '
j
s/ini
t
-defaultbranch-advice'
commit
|
commitdiff
|
tree
2020-12-18
J
u
nio C Hamano
Merge https://githu
b
.
com
/
pra
t
i0100/git-gui
commit
|
commitdiff
|
tree
2020-12-17
Ju
n
i
o
C Hamano
Another batc
h
be
f
o
r
e 2
.
30-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
J
unio C Hamano
Merg
e
bra
n
c
h
'
j
h/index-
v
2-doc-on-fsm
n
'
commit
|
commitdiff
|
tree
2020-12-17
Junio
C Haman
o
Merge branch 'jb/midx-doc-update'
commit
|
commitdiff
|
tree
2020-12-17
Junio C Hamano
Merge br
a
nch 'rj/make-clea
n
'
commit
|
commitdiff
|
tree
2020-12-17
J
u
nio C Haman
o
Merge branch 'js/t7
0
64-master-
t
o-initial'
commit
|
commitdiff
|
tree
2020-12-17
Ju
n
io
C H
a
m
ano
Me
r
ge bran
c
h 'j
s
/
t6300-hard
c
ode-main'
commit
|
commitdiff
|
tree
2020-12-17
J
unio C Hamano
Merge bran
c
h 'jk/oid
-
arra
y
-cleanup'
commit
|
commitdiff
|
tree
2020-12-17
Junio C Haman
o
Merge b
r
anch 'tb/
p
artial-clo
n
e
-
filters-fix'
commit
|
commitdiff
|
tree
2020-12-17
J
u
n
io C
H
amano
M
e
rge
branch
'
js/t7900-protect-
p
wd-in
-
conf
i
g
-
get'
commit
|
commitdiff
|
tree
2020-12-17
Rand
a
ll S
.
Becker
confi
g
.
mak
.
unam
e
: remove old NonStop compati
b
ilit
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
E
l
i
jah N
e
wren
merge-ort: implement merg
e
_incore_recurs
i
ve()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Eli
j
ah Newren
m
e
r
g
e-ort: ma
k
e
cl
e
ar
_
interna
l
_opts() aware
o
f par
t
i
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Newren
merge-ort: copy a few s
m
all helper functio
n
s from merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
E
l
ij
a
h
Newren
commit
:
mov
e
re
v
erse_comm
i
t
_li
s
t
(
) from
m
e
r
ge-recursive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Jiang Xin
pack-redundan
t
: f
i
x cras
h
when one pa
c
k
f
ile in
r
ep
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Joha
n
nes
Schind
e
li
n
te
s
ts:
d
rop the `PREPARE_FOR_M
A
IN_BRANCH` prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johannes Schindelin
t9902: use
`
main` as initia
l
bra
n
ch n
a
me
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johannes Schindel
i
n
t6302: use `ma
i
n`
a
s init
i
a
l
b
r
an
c
h name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Joh
a
nn
e
s Schindelin
t5703: use `ma
i
n` as initial branc
h
name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
J
o
hannes Sc
h
i
n
delin
t5
5
10:
use `mai
n
` as initial branch name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johannes Schindel
i
n
t55
0
5
:
finalize tra
n
sitio
n
ing to using the
b
ranch nam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
J
ohannes Schindelin
t
32
0
5: finaliz
e
transitioning to u
s
ing the
br
a
nch name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johannes Sc
h
indelin
t3
2
0
3
: complete
t
h
e trans
i
tion to using the branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johann
e
s
Schind
e
lin
t3201: finalize transit
i
o
n
ing
to
using the bran
c
h name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Johannes Schindelin
t3200: finish tr
a
ns
i
tio
n
ing to the
i
nitial branch name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
J
o
hann
e
s Schindelin
t1400:
use `main` as initial branch name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-17
Junio C Hamano
diff: correct interaction
b
etween --exit-code
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-16
E
r
ic Sun
s
h
i
ne
t/perf: fix test_export() f
a
ilure
with
B
SD
`sed`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-16
F
e
l
ipe Co
n
treras
pull: d
i
s
play default warning on
l
y w
h
en non-ff
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
pul
l
: correct condition to trigg
e
r non-ff adv
i
c
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-16
Junio C
H
a
mano
pull: g
e
t rid of
u
nnece
s
sary
g
lobal va
r
i
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-16
Ævar Arnfjörð Bja
r
mason
style:
do not "
b
r
e
ak" in sw
i
tch() aft
e
r "
r
etur
n
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-15
Junio C Hamano
compat-util:
p
retend
t
hat stub
set
i
ti
m
er()
a
l
ways succee
d
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-15
Junio C
Hama
n
o
strmap: ma
k
e caller
s
of str
m
ap_remove() to call i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
Đoàn Trầ
n
Công Danh
doc: mention Pyt
h
on 3
.
x su
p
p
ort
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
Junio C Hamano
G
i
t
2
.
3
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
Junio C Hamano
M
e
rge branch 'j
s
/t55
2
6-wit
h
-no-particular-p
r
imary-
b
ranch
.
.
.
commit
|
commitdiff
|
tree
2020-12-14
Junio C
Hamano
Merge branch
'js/cmake-extr
a
-built-ins-fix'
commit
|
commitdiff
|
tree
2020-12-14
Junio C Hamano
M
er
g
e branc
h
'da/v
s
-bu
i
l
d-iconv-f
i
x'
commit
|
commitdiff
|
tree
2020-12-14
Junio
C Hama
n
o
M
erge branch 'jk/m
u
lti-lin
e
-inde
n
t-style-f
i
x'
commit
|
commitdiff
|
tree
2020-12-14
Junio C Hama
n
o
Merg
e
branch '
j
k/check-co
n
fig-pars
i
ng-error-in-upload
.
.
.
commit
|
commitdiff
|
tree
2020-12-14
J
unio C Ham
a
no
Merge branch 'ae/doc-reproducible
-
html'
commit
|
commitdiff
|
tree
2020-12-14
Junio
C Hama
n
o
Merge b
r
anch 'so/glossary-branch-is-not
-
ne
c
essarily
.
.
.
commit
|
commitdiff
|
tree
2020-12-14
Jun
i
o C H
a
mano
Merge branch
'fc/at
m
ark-i
n
-refspec'
commit
|
commitdiff
|
tree
2020-12-14
Junio C Hamano
Merg
e
branch 'dd
/
he
l
p-autocorr
e
c
t-n
e
ver'
commit
|
commitdiff
|
tree
2020-12-14
Felipe Co
n
treras
pull: give t
h
e advice for choo
s
ing rebase
/
mer
g
e muc
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
Felipe Co
n
treras
pull: refa
c
tor
f
ast
-
forward check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
J
eff Hostetler
i
ndex-for
m
at
.
txt: docum
e
n
t
v2
f
ormat of fil
e
system
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-14
J
o
hannes Berg
doc
s
:
m
ulti-
p
a
c
k-ind
e
x: remove note about future 'ver
i
f
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Johan
n
es Schindelin
init: provide useful
advi
c
e about init
.
defaultBra
n
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Joha
n
ne
s
S
chindelin
get_d
e
fau
l
t
_branch_
n
ame(
)
: pr
e
pa
r
e for
s
h
o
wing som
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Johannes S
c
h
i
ndel
i
n
branc
h
-m: a
l
low re
n
aming a yet-u
n
bo
r
n b
r
anch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Johannes Schindelin
init
:
docu
m
e
n
t
`i
n
i
t
.
defaultBr
a
nch` better
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
merge-ort: add mod
i
f
y
/delete handling
a
n
d
d
elayed output
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
me
r
ge-ort:
add die-
n
ot-imple
m
ent
e
d stub ha
n
dle_cont
e
nt_me
r
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
mer
g
e-ort: add functi
o
n grouping comme
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
e
rge-ort: a
d
d a pat
h
s_to_free
f
ield to merge_options
_
in
t
ernal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
merge-ort: add
a path_co
n
flict field to mer
g
e
_
options_in
t
ernal
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 clear
_
internal_opts help
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
a
h
Newren
me
r
g
e-ort:
a
dd
a
few includes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lija
h
Newren
merge-ort
:
f
ree data
struc
t
u
r
es in merge
_
fi
n
aliz
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h Newren
merge-ort: add implementation of record
_
confli
c
ted_
i
nd
e
x_ent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
tr
e
e
:
e
nable cmp_cach
e
_name_compare(
)
t
o
be used el
s
ewhere
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah Newren
merge-ort: add implement
a
tion of checkout()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
New
r
en
me
r
ge-ort: basic outl
i
ne for merge_swit
c
h_to_r
e
sult()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Ne
w
ren
mer
g
e-ort: step 3 of tree writ
i
n
g -- handling
subdir
e
ctories
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
m
e
rge-ort
:
st
e
p 2 of tree writing -- functio
n
to create
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewren
merge-
o
r
t
: step 1 of tre
e
w
riting
-
-
record basename
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah New
r
e
n
merge-ort: have proces
s
_entri
e
s op
e
r
a
t
e
in a defined
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah Newren
merge-or
t
: a
d
d a p
r
eliminar
y
s
i
m
p
le
pro
c
ess_en
t
ries
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
ja
h
Newren
me
r
ge-o
r
t
:
avoid r
e
cursin
g
into identical
trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: record stage and auxiliary info for ev
e
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah Newren
merg
e
-ort: compute a few m
o
r
e us
e
ful fi
e
lds fo
r
c
o
l
lect_merg
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah Newren
m
erge-ort:
avoid repeat
i
ng fill_
t
ree_descriptor() on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newr
e
n
merge-ort: implement a
very
ba
s
ic collect_me
r
ge_info(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
i
jah Newren
m
erge-o
r
t: add an err()
f
u
nc
t
ion simil
a
r
t
o on
e
fro
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah Newren
merge-ort: use hi
s
t
ogram diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
j
a
h Newren
mer
g
e-or
t
: port merge_start() from me
r
ge-re
c
ursive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah Ne
w
ren
me
r
ge-ort
:
add some high-lev
e
l algorithm structure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h
Newre
n
m
e
rge-ort: setup basic
i
nternal data structure
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
brian m
.
car
l
son
rev-pa
r
se
:
add option for absolute or
r
ela
t
iv
e
path
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-13
brian m
.
ca
r
l
son
abspath: add a fu
n
c
t
ion to resolve paths with
missin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-10
Josh
S
te
a
dmon
t
7
900: use --fixed-value in
g
it-maintenance tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Ævar Arnfjörð Bj
a
rmason
pre
t
ty format %(tr
a
ilers):
a
d
d a "key_value_separator"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Ævar Arnfjörð Bja
r
m
ason
pretty format %(t
r
ailers): a
d
d a "keyonly"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Ævar
A
rn
f
j
ö
r
ð
B
j
a
rmas
o
n
pret
t
y
-
fo
r
mat %(trailers): f
i
x broken standalone
"
value
o
nly"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Ævar Arnfjörð Bjarmason
p
r
ett
y
for
m
a
t %(trailers) doc: avoid rep
e
titio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Peter Kaestle
sub
m
odules: fix of regression o
n
fetc
h
ing
o
f non-i
n
it
.
.
.
CC:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Ramsa
y
Jones
Makefile: don't use a versioned temp distribution d
i
rectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2020-12-09
Ramsa
y
Jones
Makefile: don't try
to clea
n
old de
b
ian bui
l
d prod
u
ct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next