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 branch 'ma/lockfile-cleanup'
2018-05-30
Junio C Hamano
Merge br
a
nch
'ma/lockf
i
le-cl
e
a
n
u
p'
commit
|
commitdiff
|
tree
2018-05-30
Junio C
Hamano
Merge
b
ranch 'sg/t6500-
n
o
-redir
e
ct-of-stdin'
commit
|
commitdiff
|
tree
2018-05-30
Junio
C Hamano
M
e
r
ge branch 'bp/merg
e
-rename-config'
commit
|
commitdiff
|
tree
2018-05-30
Ju
n
io C Hamano
Merg
e
branch 'j
s
/sequencer-a
n
d
-root-commits'
commit
|
commitdiff
|
tree
2018-05-30
Junio
C Hamano
Merge branch 'd
d
/se
n
d-email-r
e
edit
'
commit
|
commitdiff
|
tree
2018-05-29
Juni
o
C Hamano
Sync with Git
2
.
17
.
1
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
The six
t
h bat
c
h f
o
r 2
.
1
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-23
J
unio C Hamano
Merge branch 'fg/c
o
mpletio
n
-
ex
t
er
n
al'
commit
|
commitdiff
|
tree
2018-05-23
Junio
C
Ha
m
a
n
o
M
e
rge branch 'bc/asciidoctor
-
tab-w
i
dth'
commit
|
commitdiff
|
tree
2018-05-23
J
unio
C Hamano
Merge branch 'nd/pack-
u
nrea
c
ha
b
le-objects-d
o
c'
commit
|
commitdiff
|
tree
2018-05-23
Junio C H
a
mano
Merge bran
c
h
'
nd/completion-alias
f
il
e
type-ty
p
ofix'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Haman
o
Merg
e
branch 'em/status-rename-config'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge branch 'cc
/
perf-bisec
t
'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
M
erge bran
c
h 'ah/
m
i
s
c-doc-updates'
commit
|
commitdiff
|
tree
2018-05-23
Junio
C Ham
a
n
o
M
e
rge b
r
anch
'
b
p/test-d
r
o
p-ca
c
h
es'
commit
|
commitdiff
|
tree
2018-05-23
Ju
n
io C Ha
m
an
o
M
e
r
g
e branch 'en/
u
npack
-
trees
-
s
plit-index-fix'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
H
amano
Merg
e
branch
'nd/doc-header'
commit
|
commitdiff
|
tree
2018-05-23
Junio
C
Haman
o
Merge b
r
anch 'bc
/
for
m
at-patch-cover-
n
o-attach'
commit
|
commitdiff
|
tree
2018-05-23
Jun
i
o C
Hamano
Merge b
r
anch 'tb/test-
a
pfs-utf8-normalization
'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio C Hamano
M
e
rge
branch
'
js
/
rebase-rec
r
eate-m
e
rge
'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merg
e
b
ranch
'
n
d
/p
a
ck-objects-pack-struct'
commit
|
commitdiff
|
tree
2018-05-23
Jun
i
o C Hamano
M
e
r
g
e branch 'en/rena
m
e
-directory-detection-reboot'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merg
e
b
ra
n
ch '
j
s/no
-
pager-s
h
orthan
d
'
commit
|
commitdiff
|
tree
2018-05-23
Junio C
Hamano
Merge b
r
anc
h
'
j
s/rebase
-
i-clean-msg-
a
fter-fixu
p
-continue'
commit
|
commitdiff
|
tree
2018-05-23
Ju
n
i
o
C Hamano
Merge branch
'tg/wor
k
tree
-
add-existin
g
-br
a
n
ch'
commit
|
commitdiff
|
tree
2018-05-23
Junio
C
Hamano
Merge
b
ranch 'js/de
p
r
e
c
at
e
-grafts'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge branch 'js/test-unset-p
r
ereq'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio C Hamano
Merge branch 'a
b
/pe
r
l-python-attrs'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Mer
g
e branc
h
's
b
/oid-object-info'
commit
|
commitdiff
|
tree
2018-05-23
Jun
i
o
C H
a
mano
Merge b
r
anch 'cc/perf-aggregat
e
-unknown-option'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio C Hamano
Merge branch 'en/git-debugger'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge branch
'
bw
/
serv
e
r-options'
commit
|
commitdiff
|
tree
2018-05-23
J
unio C Hamano
M
e
r
g
e
branch 'nd/repack-kee
p
-pack'
commit
|
commitdiff
|
tree
2018-05-23
Jun
i
o C
H
amano
Merge branch 'ds/
l
azy-load-trees'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge b
r
anch
'nd/term-columns'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Ha
m
an
o
Merg
e
branch 'sg/t7005-spaces-i
n
-filena
m
es-cleanup'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Merge branc
h
'sg/t5516
-
fixes
'
commit
|
commitdiff
|
tree
2018-05-23
Jun
i
o
C
Hamano
Merge branch
'sg/t53
1
0-jgit-
b
itmap-test'
commit
|
commitdiff
|
tree
2018-05-23
J
u
nio C
Hamano
Merg
e
b
ranch 'nd/p
a
ck-f
o
rmat-doc'
commit
|
commitdiff
|
tree
2018-05-23
J
unio C H
a
mano
Merge
branch 'j
k
/apply-p-doc'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
Mer
g
e
bra
n
ch 'ao/config-api-doc'
commit
|
commitdiff
|
tree
2018-05-23
Junio C Hamano
M
erge branch 'bc/mail
m
ap-self'
commit
|
commitdiff
|
tree
2018-05-23
Junio C H
a
mano
Me
r
ge bra
n
c
h
'
s
b
/object-store
-
r
e
p
lace'
commit
|
commitdiff
|
tree
2018-05-23
Jun
i
o
C Ham
a
no
Me
r
g
e branch
'
hn/sort-ls
-
remot
e
'
commit
|
commitdiff
|
tree
2018-05-22
Juni
o
C H
a
ma
n
o
G
i
t 2
.
17
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-22
Junio C Hamano
Merge branch 'jk/submodule-fsck-loose'
i
n
to maint
commit
|
commitdiff
|
tree
2018-05-22
Junio C Haman
o
Sync with Gi
t
2
.
1
6
.
4
commit
|
commitdiff
|
tree
2018-05-22
Junio C
H
amano
Git
2
.
16
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-22
Junio
C Haman
o
S
ync with Gi
t
2
.
15
.
2
commit
|
commitdiff
|
tree
2018-05-22
Junio C Hamano
Git 2
.
15
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-22
Juni
o
C Hamano
Sync with Git 2
.
14
.
4
commit
|
commitdiff
|
tree
2018-05-22
Junio C Hamano
Git 2
.
1
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-22
Junio
C
Hamano
Sync w
i
th Git
2
.
13
.
7
commit
|
commitdiff
|
tree
2018-05-22
Junio C
Hamano
Gi
t
2
.
13
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-22
Junio C Hamano
Merge bra
n
ch 'j
k
/submodule-fix-loose' int
o
maint-2
.
1
3
commit
|
commitdiff
|
tree
2018-05-21
Jeff
King
g
et_main_ref_store: BU
G
(
)
w
h
e
n
o
u
t
si
d
e
a repo
s
itory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-17
S
tef
a
n Beller
object
.
c: clear r
e
place map before freeing
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-15
SZEDER Gábo
r
t7005
-
edit
o
r:
get ri
d
of the SPAC
E
S_IN
_
FILENAMES prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-13
René Scharfe
t5512: run g
i
t
fetch inside test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-13
Nguyễn Thái Ngọ
c
Duy
colu
m
n
:
fix off-by-on
e
d
e
fault
w
idth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-13
J
e
f
f
K
ing
pager: set COLUMNS to term
_
colum
n
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-13
Nguyễn Thái Ngọc Duy
pa
c
k-format
.
txt: m
o
re details on pack
f
il
e
format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
J
e
ff Ki
n
g
app
l
y: clarify
"
-
p" documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
SZEDER Gábor
t5516-fetc
h
-
p
ush: f
i
x bro
k
en &&-chain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
SZEDER Gábor
t5516-fetch-push: fix 'p
u
sh wi
t
h dr
y
-
r
un' test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
SZED
E
R Gá
b
or
t5
3
10-p
a
ck
-
b
i
t
m
ap
s
: make JGit tests work wit
h
GIT_TEST_SPL
I
T
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-11
Antonio
Ospite
doc:
f
ix config API d
o
cumentation about config_wit
h
_options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-10
Stefan
B
eller
replace
-
o
bject
.
c: remove the_r
e
pository
f
rom
prepare_re
p
lace
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-10
Stefan Beller
object
.
c: free replace ma
p
in raw_obj
e
ct
_
store_clear
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-10
M
artin Ågren
lock_f
i
le:
move
st
a
tic lo
c
ks in
t
o functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-10
Martin Ågren
loc
k
_file: make function
-
local locks non-static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-10
Martin Ågren
refs
.
c: do not die if loc
k
ing fa
i
ls
in `
d
elet
e
_pseudoref()`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-10
Martin
Å
gre
n
refs
.
c: do not die if locking
f
ail
s
i
n
`write_pseudoref()`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-10
M
a
rtin Ågre
n
t/hel
p
er/test-write
-
cache: clean
u
p lock-ha
n
d
l
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-09
SZEDER Gá
b
or
t6
0
50-
r
epla
c
e: don't
d
isable stdin for the whole test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
B
en Pea
r
t
merge:
pass
ag
g
ressive when ren
a
me d
e
t
e
ct
i
on is t
u
rned off
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Ben Peart
mer
g
e:
a
dd mer
g
e
.
renames
c
onfig set
t
in
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Ben Pear
t
m
erge: upd
a
te documen
t
ation f
o
r {merge,diff}
.
renameLimit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah
N
ewre
n
merge-re
c
ursiv
e
: fi
x
check for
s
kipability of working
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h Newren
m
erge-r
e
curs
i
ve:
m
ak
e
"A
u
to-mergi
n
g
" comment show for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merge-recursive: fix re
m
ainder of
was_
d
irty() to us
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
me
r
g
e
-recu
r
s
i
v
e
: fix was
_
tracked(
)
to
quit lying with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t6
0
46: t
e
st
c
ases checking
w
hether up
d
a
t
es ca
n
be
skippe
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ija
h
Newr
e
n
merge-recurs
i
ve: avoid
t
rigge
r
ing add_cachein
f
o
error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
j
a
h Newren
m
e
r
g
e
-recursive: mo
v
e more is_dirty
h
a
ndli
n
g to merge_content
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah
N
ewren
merge
-
recursiv
e
: improve add_cacheinfo
e
rror ha
n
dling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah
N
ew
r
e
n
merge-re
c
ursive: avoid
s
puri
o
us
r
ename/rena
m
e c
o
nfl
i
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newr
e
n
directory rename detect
i
o
n: new te
s
t
cases
showcasi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-recursive: fix remaini
n
g
dir
e
ct
o
ry r
e
name + dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wr
e
n
mer
g
e-recursive: fix overwritin
g
di
r
ty files involve
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e
-recursive:
av
o
id clob
b
e
ring unt
r
acked file
s
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge
-
recu
r
siv
e
: apply necessary m
o
difications for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-re
c
urs
i
ve
:
when compar
i
ng
f
iles, don't incl
u
de
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursi
v
e: c
h
eck for fil
e
level conflicts then
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
m
erge-recursive: add com
p
utation of collisions
due
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
li
j
ah Newren
merge-recur
s
ive: check for dir
e
c
tory
l
e
vel
c
onflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
New
r
en
m
erge-re
c
ursive: add get_directory_renames(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Junio C Hama
n
o
The fifth
b
a
t
ch for 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Junio C
H
amano
M
er
g
e branch '
m
a/http-walke
r
-
n
o
-
partial'
commit
|
commitdiff
|
tree
2018-05-08
Juni
o
C Haman
o
M
e
rge b
r
an
c
h 'js/runtime-prefix'
commit
|
commitdiff
|
tree
next