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: update documentation for {merge,diff}.renameLimit
2018-05-08
Be
n
Peart
merge:
u
pd
a
t
e
documentation for {merge
,
diff}
.
rename
L
i
m
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merge-recursive: fi
x
check for sk
i
p
a
bil
i
ty of working
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
mer
g
e-r
e
cursive: make "Auto-me
r
g
i
ng" comm
e
nt show for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-r
e
cu
r
sive: fix remainder of was_dirty(
)
to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
r
en
merge-recurs
i
ve
:
fix was_tracke
d
(
) to quit lying with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
wr
e
n
t6046: te
s
tcases checking w
h
et
h
er updates
can be skip
p
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
m
e
rge-recur
s
ive: av
o
i
d tr
i
ggering
add_
c
ac
h
einfo
e
r
r
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-re
c
ursive: move mo
r
e
i
s_dirty hand
l
ing
to merge_content
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merg
e
-recursive: improve add_c
a
chei
n
fo
error handl
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: a
v
oid spurious rename/rename confl
i
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
d
ire
c
tor
y
r
ename detecti
o
n
:
ne
w
te
s
tcases showcasing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
r
e
n
merge-recurs
i
v
e
:
f
i
x
rema
i
n
i
n
g
directory renam
e
+ di
r
t
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-recursive:
f
ix overw
r
iting dirty
f
iles inv
o
lved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursive: a
v
oid clo
b
bering untracked files
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
merge
-
recursive
:
apply nec
e
ssary modi
f
ications for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-rec
u
rsive: w
h
en c
o
mp
a
rin
g
files, don't include
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursi
v
e
: chec
k
for file
level conflict
s
then
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
m
e
r
g
e-recursive: add computati
o
n of c
o
ll
i
sions due
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h N
e
wren
m
erge-recursi
v
e: check
f
or
d
ir
e
ct
o
r
y level conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-
r
ecur
s
ive: a
d
d
get
_
d
i
r
e
ctory_renam
e
s
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
mer
g
e-recursive: mak
e
a
hel
p
er
function for
cl
e
anup
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
me
r
ge-re
c
ursiv
e
:
sp
l
i
t out co
d
e for determining diff
_
filepairs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
merge-recursive: mak
e
!o->detec
t
_re
n
a
m
e
c
odepath more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah N
e
wr
e
n
merg
e
-
r
ecursive:
f
ix l
e
aks of allocated
r
enames an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-rec
u
r
s
ive: in
t
roduc
e
new functi
o
ns to handle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
merge-recursive: m
o
v
e
the get_renames
(
) funct
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
d
irectory
rename detection:
tests for handlin
g
overwr
i
ting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
N
e
wren
directory rename d
e
tection: t
e
sts for handling
o
ve
r
writing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
rectory rena
m
e detectio
n
: miscellaneous testcases
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
irectory
ren
a
me de
t
ection: tes
t
ca
s
es explor
i
ng possibly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h
N
e
w
r
e
n
director
y
rename de
t
ecti
o
n: mo
r
e involved edge/corner
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
directory r
e
n
ame d
e
tection:
t
es
t
cases c
h
eckin
g
which
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
direct
o
r
y
rename detecti
o
n:
f
iles/directori
e
s
i
n
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
di
r
ectory rename detec
t
ion: partially rename
d
di
r
ectory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
ja
h
Newren
direc
t
ory
r
ena
m
e
detection: te
s
tcases to avoid taking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory re
n
ame de
t
ection:
directory spli
t
ting testcases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
directo
r
y renam
e
detection:
b
asic testcases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ham
a
no
M
erge branch
'
svn/aut
h
ors-prog-2' of git:
/
/bogomips
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Revert "
M
erg
e
b
r
anch
'
en/rename-di
r
ectory-detectio
n
'"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
The t
h
i
r
d batch for 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Me
r
ge branch 'e
b
/cred-help
e
r-i
g
nore-sigpi
p
e'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Hamano
Me
r
ge branch 'lv/tls-1
.
3'
commit
|
commitdiff
|
tree
2018-04-11
J
u
n
io C Hamano
M
e
rg
e
branch 'pk/test
-
avoid-p
i
pe
-
hiding-exit-status'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
H
a
m
a
no
Merg
e
branc
h
'rs
/
s
t
atus-with-removed-submodule'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch 'n
d
/co
m
bined-test-h
e
lp
e
r'
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C
H
amano
M
erge branch 'sb/packf
i
les
-
in-repository'
commit
|
commitdiff
|
tree
2018-04-11
Jun
i
o
C Ha
m
a
no
Mer
g
e br
a
nch 'sb/
o
bject-store
'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Haman
o
Merge branch
'
j
c
/test-must-be-empty'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Haman
o
Merge branc
h
'cc
/
p
erf-aggregate-sort'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C
Hamano
Mer
g
e branch 'ab/doc-h
a
sh
-
brokenness'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Ha
m
a
n
o
Merge bra
n
ch
'bc/
h
ash-independent-tests'
commit
|
commitdiff
|
tree
2018-04-11
J
u
n
i
o C
H
amano
M
erge branch 'ab/drop-contrib-examples'
commit
|
commitdiff
|
tree
2018-04-10
Junio C
Hamano
T
h
e
second batch fo
r
2
.
1
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ham
a
no
Merge branch 'ys/bis
e
c
t-object-i
d
-m
i
ssing-conver
s
ion
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Junio
C Hamano
Merge
branc
h
'yk/filter-branch-no
n
-
committ
i
sh-refs'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ha
m
ano
Merge b
r
an
c
h '
n
d
/
trace-with-
e
nv'
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C Hamano
Merg
e
branch 'nd/
p
arseopt-compl
e
tio
n
-mor
e
'
commit
|
commitdiff
|
tree
2018-04-10
J
u
nio C
H
am
a
n
o
Merge
b
ranch 'ds/bsearch-has
h
'
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C Ha
m
ano
Merge branc
h
'w
s
/rebase-p'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge
branch 'jk/diff-highl
i
ght-graph-fix'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Mer
g
e br
a
nch 'nd/
r
emove-ignor
e
-env-field
'
commit
|
commitdiff
|
tree
2018-04-10
J
u
nio C Hamano
M
e
rge branch 'ps/c
o
nt
a
ins-id-err
o
r-message'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Th
e
first batch f
o
r 2
.
18 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-09
Juni
o
C
Hamano
Merge bra
n
ch 'tg
/
stash-untracked-with-pathspec-fix'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
M
e
rge br
a
nc
h
'nd/worktr
e
e
-prune'
commit
|
commitdiff
|
tree
2018-04-09
Junio C H
a
m
a
no
M
e
r
ge
branc
h
'
b
c/o
b
ject-id'
commit
|
commitdiff
|
tree
2018-04-09
Junio
C H
a
mano
Me
r
ge branch 'm
a
/shortlog-revparse'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Ha
m
a
no
Mer
g
e branch
'ab/ins
t
all-
s
yml
i
nks'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hama
n
o
Merge branch 'ml/filter
-
bran
c
h-no
-
op-error'
commit
|
commitdiff
|
tree
2018-04-09
Junio
C Hamano
Merge
branch '
a
b/
p
cr
e
-v2'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Ha
m
ano
Merge bran
c
h
'ti/fetc
h
-everythi
n
g-local-optim'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
M
e
rge branch 'en/ren
a
me-direc
t
o
ry-d
e
tec
t
ion'
commit
|
commitdiff
|
tree
2018-04-02
Ju
n
io C Ha
m
ano
Git 2
.
17
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-02
Junio C Hamano
Merge tag 'l10n-2
.
17
.
0
-
rnd1' of git://github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
J
u
nio C Haman
o
Merge branch 'p
w
/add-p-single'
commit
|
commitdiff
|
tree
2018-04-01
Ævar Arnfjörð Bjarma
s
on
add -
p
: fix 2
.
17
.
0-rc* regressi
o
n due to moved code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Jun
i
o
C
Hamano
M
e
r
g
e branc
h
'jh/
p
ar
t
ial-clon
e
'
commit
|
commitdiff
|
tree
2018-03-29
Jon
a
than Nieder
upload-pack: disab
l
e
o
b
ject
filterin
g
when disabled
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
E
r
i
k
E Brad
y
credentia
l
:
igno
r
e SIGPI
P
E when writi
n
g to
c
redential
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Loganade
n
Vel
v
indron
http: allow us
e
of TLS 1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
R
e
né Scharfe
subm
o
dule: check
for NUL
L
re
t
urn of get_submodule_ref_store()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Junio
C H
a
mano
Git 2
.
17-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Junio
C
Hamano
Merge branch 'tg
/
sta
s
h
-doc-ty
p
ofi
x
'
commit
|
commitdiff
|
tree
2018-03-28
J
u
nio C Hamano
Merge
br
a
nch
'p
c
/
s
ubm
o
dule-helper'
commit
|
commitdiff
|
tree
2018-03-28
Junio C Hamano
M
e
rg
e
branch 'nd/p
a
rseopt-completion'
commit
|
commitdiff
|
tree
2018-03-28
Prat
i
k
K
arki
test: avoid
p
ipes in
g
it r
e
l
a
ted com
m
and
s
f
o
r test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Stefan
B
eller
s
u
bmodule d
e
init: handle non existin
g
p
a
t
h
s
pecs grace
f
ully
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Thomas Gummerer
git-stash
.
txt: remo
v
e extra squ
a
re br
a
cket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arnfjör
ð
B
j
armason
doc hash-functio
n
-tr
a
nsiti
o
n: clari
f
y what
SHAttered
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Æv
a
r Arnfjö
r
ð Bjarmason
doc
h
ash-function-transition: clarify h
o
w older gits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
SZEDER Gábo
r
test_must_be_
e
mpt
y
:
sim
p
lify
file exis
t
ence
ch
e
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Christian
Cou
d
er
per
f
/aggregate: a
d
d
--sort-by=regression option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Ch
r
istian Couder
perf/agg
r
egate:
add display_dir(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Ng
u
yễn Thá
i
N
g
ọc Duy
t/
h
elper: m
e
r
g
e
test-write-cac
h
e
i
nto
test-
t
o
o
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
N
guyễ
n
Thá
i
N
g
ọ
c Duy
t/helper:
m
e
rg
e
tes
t
-wildmatch into test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc
Du
y
t/helper: merge t
e
st-
u
rlmatc
h
-n
o
rma
l
izati
o
n into test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn
T
h
ái Ngọc D
u
y
t/helpe
r
:
merge test-subpro
c
ess
i
n
t
o
t
est-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
N
guyễn Thái N
g
ọc
Duy
t/helper: merge test-submodu
l
e-config into test
-
to
o
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Ngu
y
ễn Thái Ngọc Duy
t
/h
e
lpe
r
: merge test-
s
trin
g
-list into test
-
tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc
D
uy
t/helper:
merge te
s
t-strcm
p
-offs
e
t
into
te
s
t-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next