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
The sixth batch for 2.18
2018-05-23
Junio C Ha
m
ano
Th
e
sixt
h
ba
t
ch for 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-23
J
uni
o
C Hamano
M
e
r
g
e
bra
n
ch '
f
g
/
c
omplet
i
on-external
'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge
b
ranch 'b
c
/asciidoctor-
t
a
b
-
widt
h
'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio C
H
am
a
n
o
Merg
e
branch 'nd/pack-unreachable-obj
e
cts-
d
o
c
'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
M
e
rge b
r
anch
'
nd/compl
e
tion
-
a
liasfi
l
etype-typof
i
x'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
Hamano
Merge bran
c
h 'em/statu
s
-rename-config'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Ham
a
no
Merge
b
ranch
'c
c
/perf-bisect'
commit
|
commitdiff
|
tree
2018-05-23
Juni
o
C
Ham
a
no
Merg
e
branch
'
ah/misc-
d
o
c-upd
a
tes'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio
C Hamano
Merge bran
c
h
'b
p
/test-dr
o
p-
c
a
ches'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
H
a
m
ano
Merge branch 'en/un
p
ack
-
trees-spl
i
t-index-fix'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio
C Hamano
Merg
e
branch 'n
d
/do
c
-header'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge branch 'b
c
/format
-
p
atch-cover-no-attach'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
H
a
mano
Merge branch 'tb/t
e
st-apfs-utf8-n
o
r
malization'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
M
erge
b
r
a
nch 'js/reba
s
e
-recreat
e
-merge'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge
bran
c
h 'nd
/
p
ack-objects-p
a
ck-struct'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio C
Ha
m
ano
Merg
e
branch '
e
n/renam
e
-directory-det
e
c
tion-r
e
boot'
commit
|
commitdiff
|
tree
2018-05-23
J
unio C Ha
m
ano
Merge
b
ranc
h
'
js/no-pager-shorthand'
commit
|
commitdiff
|
tree
2018-05-23
Ju
n
io C Hamano
Merg
e
bran
c
h 'js/rebas
e
-
i
-clean-msg-after-
f
ixup-contin
u
e'
commit
|
commitdiff
|
tree
2018-05-23
Ju
n
io C Hamano
Merge b
r
anch 't
g
/worktree-ad
d
-
e
xisting-branch'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Ha
m
an
o
Merg
e
branc
h
'js
/
deprecate
-
grafts'
commit
|
commitdiff
|
tree
2018-05-23
Junio
C
Hamano
Merge branch 'js/test-
u
n
s
e
t-pre
r
eq'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
Ha
m
ano
Merge
b
ranch 'ab
/
perl-p
y
thon-attrs
'
commit
|
commitdiff
|
tree
2018-05-23
Ju
n
io C Haman
o
Merge branch
'sb/oid-object
-
i
nfo
'
commit
|
commitdiff
|
tree
2018-05-23
J
unio
C Hamano
Mer
g
e b
r
anch 'cc/perf-aggre
g
a
t
e-unknown-opt
i
on'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
H
amano
Merge b
r
anch '
e
n
/git-debug
g
er'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hama
n
o
Me
r
ge branch '
b
w
/
server-options'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio C Hamano
Merg
e
branch
'
n
d
/repack-keep-
p
ack'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
H
amano
M
e
r
ge branch '
d
s
/
l
azy-load-tr
e
es'
commit
|
commitdiff
|
tree
2018-05-23
J
uni
o
C Hamano
Merge branch 'nd
/
t
e
rm-col
u
mns'
commit
|
commitdiff
|
tree
2018-05-23
Juni
o
C Haman
o
Merge branch
'
sg/t700
5
-
s
p
a
c
e
s
-in-f
i
le
n
ames-cl
e
anup'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge br
a
nch 'sg/
t
5516-fixes'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
M
erge branch 'sg/t53
1
0-jgit-bit
m
ap-test'
commit
|
commitdiff
|
tree
2018-05-23
Jun
i
o C Haman
o
Merge branch 'nd/pack-format-doc
'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge branch 'jk/apply-p-doc'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merg
e
branc
h
'ao/config-api-doc'
commit
|
commitdiff
|
tree
2018-05-23
Juni
o
C Hamano
M
erge branch
'
bc/mailmap
-
se
l
f'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Ham
a
n
o
M
erge branch 'sb/object-store
-
r
eplace'
commit
|
commitdiff
|
tree
2018-05-23
Juni
o
C Hamano
Merge branch
'
hn/sort-ls-remote'
commit
|
commitdiff
|
tree
2018-05-21
Jeff Ki
n
g
get
_
ma
i
n_ref
_
sto
r
e: BUG() when outsid
e
a
r
epository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-17
Stefan
B
e
ller
ob
j
ect
.
c: clea
r
rep
l
ac
e
m
a
p
bef
o
re freeing it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-15
SZEDER Gábor
t7005-editor: get
r
id
of the SPAC
E
S_
I
N_FILENAMES prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-13
Ren
é
Scharfe
t5512: ru
n
git fe
t
ch inside test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-13
Nguyễn T
h
ái Ngọc Duy
column
:
f
i
x
o
ff
-
b
y
-on
e
de
f
ault width
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-13
Jeff King
pager: set COLUMNS to
term_columns()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-13
Nguyễn Thái Ngọc D
u
y
pa
c
k-form
a
t
.
txt: more details on pack file format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
Jeff King
appl
y
:
c
l
arify "-
p
" documen
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
SZEDER Gábor
t5516-fetc
h
-
p
ush: fix br
o
ken &&-c
h
ain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
SZEDER Gábo
r
t
5
516-fe
t
ch-push:
f
ix 'push with dry-run'
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
S
Z
EDE
R
Gábo
r
t5310-
p
ac
k
-bi
t
maps: make
J
G
it tests work with GIT_TEST_
S
PLIT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
Ant
o
n
io Os
p
i
te
do
c
: f
i
x co
n
fig API documen
t
a
tion about config_with_option
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-10
S
t
efan Beller
repla
c
e-
o
bject
.
c: remo
v
e the
_
re
p
ository from pr
e
p
are_replace
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-10
St
e
fan Bell
e
r
object
.
c: free replace
map in ra
w
_object_store_clear
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewre
n
merge-recu
r
s
i
v
e
: fix check for
sk
i
pability of working
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-
r
ecursive: make "Auto-mergi
n
g" commen
t
s
h
ow for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-rec
u
rsi
v
e: fix remain
d
e
r of was_dirty() to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
mer
g
e-recursive
:
fix was_
t
racked(
)
to
quit lyi
n
g wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t6046: testcases checking
whether up
d
a
tes can be skippe
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
j
ah Newren
merge-recursive: avoid trigge
r
in
g
add_cacheinfo erro
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
e
w
ren
merg
e
-r
e
cur
s
ive: mo
v
e
m
ore is_d
i
rty
h
an
d
ling
t
o
m
erge
_
c
o
n
t
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
mer
g
e-r
e
c
u
rsive
:
improv
e
add_cacheinf
o
erro
r
ha
n
dling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah N
e
w
r
e
n
mer
g
e-recursive: avo
i
d
spurio
u
s rename/rename confli
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
d
i
rec
t
o
ry rename detection:
n
ew te
s
tcases showcasing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merg
e
-recursiv
e
:
f
i
x
remai
n
ing directory rena
m
e + dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-re
c
u
rsive:
fix overwriting dirty file
s
invol
v
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merg
e
-recursive: avoid cl
o
bbering untracked f
i
les with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah
N
ewren
m
e
rge-recu
r
s
ive: apply necessary mo
d
ifications for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah N
e
wren
merge-recursive:
when comparing f
i
les, don't
i
ncl
u
de
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: check
f
or f
i
le l
e
vel conf
l
icts then
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merge-recu
r
sive
:
add
c
omput
a
tion of collisions due
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
w
ren
m
e
rge-recursi
v
e: check
f
or di
r
ectory
l
evel conflict
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
m
erge-recursive: a
d
d get_directo
r
y_renames()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Ju
n
i
o C
Hamano
T
h
e fif
t
h bat
c
h f
o
r 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Junio C Ham
a
no
M
e
r
g
e br
a
n
c
h 'ma/http-walker-n
o
-partia
l
'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
Merg
e
branch
'
js/runtime-pre
f
ix'
commit
|
commitdiff
|
tree
2018-05-08
Ju
n
io C Hamano
Me
r
ge branch 'js/colored-
p
ush
-
e
r
ro
r
s
'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Ham
a
no
Merge branch
'jc/
p
a
r
s
e
o
pt-ex
p
iry-
e
rrors'
commit
|
commitdiff
|
tree
2018-05-08
J
unio C
Hamano
Merge branch 'ma/fast-export-s
k
ip-merg
e
-
f
ix'
commit
|
commitdiff
|
tree
2018-05-08
Junio C H
a
mano
M
e
rg
e
b
r
an
c
h 'tz/doc-git-urls-r
e
f
erence
'
commit
|
commitdiff
|
tree
2018-05-08
J
unio C Hamano
Merge branch
'
tg/demote-sta
s
h-
s
a
v
e-in
-
completion'
commit
|
commitdiff
|
tree
2018-05-08
J
u
nio C Hamano
Me
r
g
e branch 'sa/send-email-dedup-some-heade
r
s'
commit
|
commitdiff
|
tree
2018-05-08
Junio
C Ham
a
no
Merge branch 'n
d
/s
u
bmodule-status
-
fix'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
Merg
e
b
ranch 'js/ident-date
-
fix
'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
Merge branch
'bt
/
gpg-interface'
commit
|
commitdiff
|
tree
2018-05-08
Jun
i
o
C
Hamano
Merge branch '
h
n/sort-ls-remote'
commit
|
commitdiff
|
tree
2018-05-08
J
u
n
io C Hamano
Merge branch 'ab
/
git-svn-get-record-t
y
p
o
f
ix'
commit
|
commitdiff
|
tree
2018-05-08
Juni
o
C
Ham
a
no
Mer
g
e branch 'tb/config-default'
commit
|
commitdiff
|
tree
2018-05-08
J
unio
C
H
a
mano
Merge
branch 't
b
/config-t
y
pe'
commit
|
commitdiff
|
tree
2018-05-08
Ju
n
io C
Hamano
Merge branch 'sg/doc-gc-quot
e
-m
i
smatch-fix'
commit
|
commitdiff
|
tree
2018-05-08
Ju
n
io C Hama
n
o
Me
r
ge branch 'sg/compl
e
t
i
on-cl
e
ar-c
a
c
hed'
commit
|
commitdiff
|
tree
2018-05-08
Juni
o
C Hamano
Merge bra
n
ch 'sb/workt
r
e
e-remove-opt-force'
commit
|
commitdiff
|
tree
2018-05-08
J
u
nio C Ham
a
no
Mer
g
e branch 'ma/double-dashes-in-
d
o
c
s'
commit
|
commitdiff
|
tree
2018-05-08
J
u
n
io
C Hamano
M
erge branc
h
'tq/t1
5
10'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Ham
a
no
Merge br
a
nch 'so/glossary-ancestor'
commit
|
commitdiff
|
tree
2018-05-08
Junio C
Hamano
Merge
bran
c
h
'
ls/checko
u
t-encoding'
commit
|
commitdiff
|
tree
2018-05-08
J
unio C
H
amano
Merge br
a
nch 'ab/nuke-
e
macs-contrib'
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hamano
Merge
b
ranch
'nd/warn-more
-
for-devs'
commit
|
commitdiff
|
tree
2018-05-08
Juni
o
C Ha
m
a
no
Merge branch 'sb/object-store-replace'
commit
|
commitdiff
|
tree
2018-05-08
Juni
o
C Hama
n
o
M
e
rge branch 'ds/commit
-
grap
h
'
commit
|
commitdiff
|
tree
2018-05-08
J
u
n
io C Hamano
Me
r
ge br
a
nch 'js/empty-config
-
section-
f
ix'
commit
|
commitdiff
|
tree
2018-05-08
Jun
i
o
C Hamano
Merge branch '
o
t/libify-get-ref-atom-value'
commit
|
commitdiff
|
tree
next