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
apply: resolve trivial merge without hitting ll-merge with "--3way"
2021-09-05
J
u
nio
C
Hamano
apply: resolve
t
rivi
a
l m
e
rge
w
ith
o
ut
hit
t
ing ll-
m
erge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-22
Junio C Hamano
The
s
ix
t
h batc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-22
Junio C Hamano
M
e
rge br
a
nch
'
b
c
/r
e
v-
l
ist-
w
ithout-c
o
mmit-line'
commit
|
commitdiff
|
tree
2021-07-22
Junio
C
Haman
o
Merge branch
'a
b
/im
a
p-
s
end
-
rea
d
-ev
e
rything-sim
p
lify'
commit
|
commitdiff
|
tree
2021-07-22
Ju
n
io C
Ha
m
a
no
Merge branch 'ab/gitignore-di
s
c
o
very-doc'
commit
|
commitdiff
|
tree
2021-07-22
Junio C Hamano
Merge br
a
nch
'
js/ci-
w
i
n
do
w
s-update'
commit
|
commitdiff
|
tree
2021-07-22
Ju
n
io C Ha
m
a
n
o
Merge
b
r
an
c
h
'ab/send-email-optim'
commit
|
commitdiff
|
tree
2021-07-22
J
u
nio C Haman
o
Merge
b
r
a
n
ch 'j
k
/ty
p
ofix'
commit
|
commitdiff
|
tree
2021-07-17
Jun
i
o
C
H
amano
T
h
e
f
i
fth b
a
tch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-17
Junio
C
Hamano
Merge branch
'
d
s/gen
d
er-neutral
-
doc'
commit
|
commitdiff
|
tree
2021-07-17
Junio C Hamano
Merge branch 'jt/partial-clone-submodule
-
1'
commit
|
commitdiff
|
tree
2021-07-17
J
unio C Hama
n
o
Merge branch
'
a
b/struct-in
i
t'
commit
|
commitdiff
|
tree
2021-07-17
J
unio C H
a
mano
Merge branch
'
dd
/
tes
t
-s
t
dout-count-li
n
es'
commit
|
commitdiff
|
tree
2021-07-17
Junio C
H
amano
Merge
b
ranch 'hn/refs-test-cl
e
anup
'
commit
|
commitdiff
|
tree
2021-07-17
Junio C Ham
a
no
Merge bran
c
h 'rs/khash-alloc-cleanup'
commit
|
commitdiff
|
tree
2021-07-17
Junio C
H
amano
Merge
bran
c
h 'ar/help-mi
c
r
o-cleanup'
commit
|
commitdiff
|
tree
2021-07-17
J
u
nio C
H
amano
Mer
g
e b
r
a
nch 'ar/submodul
e
-
h
elper-include-clean
u
p'
commit
|
commitdiff
|
tree
2021-07-17
Junio C Hamano
M
e
rge
b
ranch
'
a
b/bundle-
u
p
d
ates'
commit
|
commitdiff
|
tree
2021-07-17
Jun
i
o C
Hamano
Merg
e
br
a
nc
h
'hn/refs-iterator-peel-r
e
turns-boolean'
commit
|
commitdiff
|
tree
2021-07-17
J
u
n
i
o C
H
aman
o
Mer
g
e branch
'ab/mktag-tests'
commit
|
commitdiff
|
tree
2021-07-17
Ju
n
io C Hamano
Merge branc
h
'
ab/show-branch-tests'
commit
|
commitdiff
|
tree
2021-07-17
J
u
nio C Hamano
Mer
g
e bran
c
h 'ab/fetch-negotiate-segv-fix'
commit
|
commitdiff
|
tree
2021-07-17
Junio C Ham
a
no
M
e
rge branch 'ab/make-delete-on-error'
commit
|
commitdiff
|
tree
2021-07-17
Junio C
H
a
ma
n
o
Merge branch 'ew/mmap-fa
i
lures'
commit
|
commitdiff
|
tree
2021-07-17
Jun
i
o C Hamano
Merge
b
ranch 'j
s
/con
f
ig
-
mak-windows-pcre-fix'
commit
|
commitdiff
|
tree
2021-07-17
Junio C H
a
m
a
no
M
e
rge branch
'j
s
/gfw-s
y
stem-con
f
ig-loc-fix'
commit
|
commitdiff
|
tree
2021-07-17
Junio C Hama
n
o
Merge branch 'k
s
/sub
m
odule-c
l
eanup'
commit
|
commitdiff
|
tree
2021-07-17
Junio C Hamano
Me
r
g
e branch
'tb/midx-use-checksum'
commit
|
commitdiff
|
tree
2021-07-17
J
unio C Hamano
Merge
b
ranch 'en/
m
erge-dir-re
n
ame-corner-case-fix'
commit
|
commitdiff
|
tree
2021-07-17
Junio C
H
amano
M
erge bran
c
h
'en/ort-pe
r
f-ba
t
ch
-
13
'
commit
|
commitdiff
|
tree
2021-07-17
Junio C Ham
a
no
Merge branch 'en/ort-perf-batch-12'
commit
|
commitdiff
|
tree
2021-07-13
Ju
n
io C Hamano
T
h
e
fourth batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-13
Junio C Hamano
Merge branch 'rs/grep-parser-fix'
commit
|
commitdiff
|
tree
2021-07-13
J
uni
o
C Hamano
M
e
r
g
e branch 'bk/do
c
-commit-ty
p
ofix'
commit
|
commitdiff
|
tree
2021-07-13
Junio C Hamano
Merge
branch '
d
c/p4-binary
-
submit-
f
ix'
commit
|
commitdiff
|
tree
2021-07-13
Junio C
H
a
mano
Me
r
g
e
branch 'ab/pre-
a
uto-gc-hook-test'
commit
|
commitdiff
|
tree
2021-07-13
Junio C Hamano
M
e
rge
branch 'jk/un
i
on-m
e
rge-binary'
commit
|
commitdiff
|
tree
2021-07-13
Juni
o
C
Hamano
Merge b
r
anc
h
'mr
/
cmake'
commit
|
commitdiff
|
tree
2021-07-13
Juni
o
C Hamano
Merge b
r
anch '
a
b/describe-test
s
-fi
x
'
commit
|
commitdiff
|
tree
2021-07-13
Junio C H
a
mano
M
e
rge branch 'ab/
p
i
c
kaxe-pcre2
'
commit
|
commitdiff
|
tree
2021-07-13
J
unio C Hamano
Mer
g
e
branch
'
hn/prep-tests-for
-
reft
a
b
l
e'
commit
|
commitdiff
|
tree
2021-07-13
J
u
nio C Hamano
Merge b
r
anch 'fc
/
p
u
sh-simple-update
s
-cle
a
nup'
commit
|
commitdiff
|
tree
2021-07-13
J
un
i
o C
Hamano
Merge branch 'fc/push-simple-updates'
commit
|
commitdiff
|
tree
2021-07-13
Junio C Hamano
Merge branch
'zh
/
cat
-
file-batch-fix'
commit
|
commitdiff
|
tree
2021-07-08
Junio
C Haman
o
The
thir
d
ba
t
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-07-08
J
u
n
i
o
C Hamano
Merge branch 'js
/
stop-exporting-bogus-co
l
umns
'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Hama
n
o
Merge branch
'd
d
/documen
t
-log-de
c
orate-default'
commit
|
commitdiff
|
tree
2021-07-08
J
un
i
o C
H
ama
n
o
Me
r
g
e
branc
h
'
a
r/test-code-cleanup'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Hamano
Me
r
ge
b
ranch 'ba/
o
bject-inf
o
'
commit
|
commitdiff
|
tree
2021-07-08
Junio C
H
amano
Merge branch 'ab/progress-cleanup'
commit
|
commitdiff
|
tree
2021-07-08
Ju
n
io C Hamano
M
e
rge
b
ranch 'ab/xdiff-bug-cleanup
'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Hamano
Mer
g
e b
r
anch 'ms/mergetools
-
kd
i
ff3-on-windows'
commit
|
commitdiff
|
tree
2021-07-08
Junio
C
Hamano
Merge branch 'ab/cmd-foo-should-return
'
commit
|
commitdiff
|
tree
2021-07-08
Junio C
H
amano
M
e
rg
e
branch
'
ar
/
doc
-
libe
r
a-c
h
a
t-in-m
y
-first-contrib'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Hamano
Me
r
ge branch '
a
r/mailinfo
-
memc
m
p-to-skip
-
prefix'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Hama
n
o
Merge branc
h
'jk
/
doc
-
max-pack-size'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Hamano
Merge bra
n
ch 'ab/fix-
c
olumns
-
t
o
-80-du
r
ing-tests'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Hamano
Merg
e
branch 'ar/more-
t
ypofix'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Hama
n
o
Merg
e
branch 'fw/com
p
lete-cmd-idx
-
fi
x
'
commit
|
commitdiff
|
tree
2021-07-08
Junio
C Hama
n
o
Merge branch 'jk/test-
w
itho
u
t
-
re
a
dlink
-
1'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Hamano
Merge branch 'jx/sideba
n
d-cleanup'
commit
|
commitdiff
|
tree
2021-07-08
J
unio C H
a
man
o
Merge
b
ranch 'jk/test-
a
void-globm
a
tch-with-
s
kip-patterns'
commit
|
commitdiff
|
tree
2021-07-08
Junio
C
Hamano
Merge branch 'jv/userdif
f
-csharp-up
d
a
te'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Ham
a
n
o
Mer
g
e branch 'ab/c
o
n
fig-hooks-path-testfix'
commit
|
commitdiff
|
tree
2021-07-08
J
unio C Hamano
Merge b
r
anch
'
fc/pull-cleanups'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Hama
n
o
Merge branch
'jk/bit
m
ap
-
t
ree-optim'
commit
|
commitdiff
|
tree
2021-07-08
Junio C
Hamano
Merg
e
bran
c
h '
a
h/graph-typofix'
commit
|
commitdiff
|
tree
2021-07-08
Jun
i
o C Hama
n
o
Merge branch 'jx/t6020-wit
h
-ol
d
er-bash'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Hamano
Me
r
g
e
branch 'ar/typof
i
x'
commit
|
commitdiff
|
tree
2021-07-08
J
unio C
H
a
m
ano
Merg
e
branch 'jk/
r
e
vision-squelch
-
gcc-warn
i
ng'
commit
|
commitdiff
|
tree
2021-07-08
Junio
C
Hamano
Merge branc
h
'ah/uninitialized-reads-fi
x
'
commit
|
commitdiff
|
tree
2021-07-08
Junio
C
Hama
n
o
Merge branch 'js/no-more-m
u
ltimail'
commit
|
commitdiff
|
tree
2021-07-08
Junio C
H
amano
Merge branch 'js/sub
t
ree-
o
n-win
d
ows-fix'
commit
|
commitdiff
|
tree
2021-07-08
J
u
n
io
C Hamano
Merge branch 'dd
/
sv
n
-tes
t
-wo-
l
ocale-a
'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Hama
n
o
Merge br
a
nch 'fc
/
do
c
-default-to-upstream-config'
commit
|
commitdiff
|
tree
2021-07-08
Ju
n
io C Hamano
Merge branc
h
'js/
t
race2-discard-event-docfix'
commit
|
commitdiff
|
tree
2021-07-08
Junio C Ha
m
a
no
Merge branch 'tb/complet
e
-diff-anchored
'
commit
|
commitdiff
|
tree
2021-07-08
Junio C H
a
mano
Merge b
r
a
nch
'tk
/
partial-clone-re
p
ack-do
c
'
commit
|
commitdiff
|
tree
2021-06-14
Junio C
Hama
n
o
The
seco
n
d
batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-06-14
Junio C Hamano
Merge b
r
anch 'fc/doc-build-cl
e
anup'
commit
|
commitdiff
|
tree
2021-06-14
J
u
nio C
H
a
mano
Merge br
a
n
c
h
'ab/te
s
t-lib-upd
a
t
es
'
commit
|
commitdiff
|
tree
2021-06-14
Juni
o
C Hamano
Merge branch 'dd/
h
onor-us
e
rs-tar-in-tests
'
commit
|
commitdiff
|
tree
2021-06-14
Juni
o
C Hamano
Me
r
ge branc
h
'ps/rev-l
i
st
-
object-type
-
filter'
commit
|
commitdiff
|
tree
2021-06-14
Juni
o
C Hamano
Mer
g
e branch
'
a
b/tr
a
ce2-sq
u
e
lch-
g
cc-warning
'
commit
|
commitdiff
|
tree
2021-06-14
J
uni
o
C Ham
a
no
Merge bra
n
ch 'so/log-
m
-impli
e
s-
p
'
commit
|
commitdiff
|
tree
2021-06-14
Junio C Hamano
Merge br
a
nch 'e
n
/ort-perf-bat
c
h-11'
commit
|
commitdiff
|
tree
2021-06-14
Junio C Ham
a
no
Merg
e
branch
'jk/
f
e
tc
h
-pack-v2-half-cl
o
se-early'
commit
|
commitdiff
|
tree
2021-06-14
Junio C Hamano
M
erge branch
'ds/wr
i
t
e
-index-with-
h
ash
f
ile-a
p
i'
commit
|
commitdiff
|
tree
2021-06-14
J
u
n
i
o C Ha
m
an
o
Merge branc
h
'
j
k/clon
e
-clea
n
-upon-transport-e
r
ror'
commit
|
commitdiff
|
tree
2021-06-14
Juni
o
C
Hama
n
o
Merge b
r
an
c
h
'ga/se
n
d-email-s
e
ndmail-cmd
'
commit
|
commitdiff
|
tree
2021-06-14
J
u
n
io C Hamano
Me
r
ge branch 'z
h
/r
e
f-filter-atom
-
ty
p
e'
commit
|
commitdiff
|
tree
2021-06-10
Junio
C
Hamano
The
f
ir
s
t batch post Git 2
.
32
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2021-06-10
Junio C Hamano
Merge branch 'ah/setup-exten
s
ions-message-i1
8
n-fix'
commit
|
commitdiff
|
tree
2021-06-10
Junio C Ham
a
no
Me
r
ge branch 'ah
/
fetch-reject-wa
r
ning-gra
m
mofix'
commit
|
commitdiff
|
tree
2021-06-10
Junio C Hamano
Me
r
ge b
r
a
n
c
h
'jk
/
doc-col
o
r-
p
age
r
'
commit
|
commitdiff
|
tree
2021-06-10
Jun
i
o C Hama
n
o
Merge bra
n
ch 'tl/fix-p
a
c
k
f
ile-uri-doc'
commit
|
commitdiff
|
tree
2021-06-10
Jun
i
o C
Ham
a
no
Merge branch 'ry/clarify
-
fast
-
f
o
rward-in-glossary'
commit
|
commitdiff
|
tree
2021-06-10
Junio
C
Hamano
Mer
g
e
b
ranc
h
'wm/rev-parse-
d
ie-i1
8
n'
commit
|
commitdiff
|
tree
2021-06-10
Junio C Hamano
Merge
branch '
j
c/cl
a
ri
f
y-revision-r
a
n
ge'
commit
|
commitdiff
|
tree
2021-06-10
J
u
nio C Hamano
Mer
g
e branch 'ah/d
o
c-de
s
cribe'
commit
|
commitdiff
|
tree
next