repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: provide pair of `unpack_trees_{start,finish}()`
2018-05-20
Elijah Newren
merge-recursive
:
pro
v
ide pair o
f
`u
n
pac
k
_
tr
e
es
_
{start
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-20
Ma
r
tin Ågren
merge: s
e
tup `opts` later in
`
checkou
t
_fas
t
_forw
a
r
d()`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
B
e
n Peart
merge:
p
ass agg
r
es
s
iv
e
when rename dete
c
tion
i
s
turned off
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Ben
P
eart
merge:
add mer
g
e
.
renames config se
t
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Ben
P
eart
merge: upd
a
te do
c
umen
t
ation for {merge,diff}
.
renameLimit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recu
r
sive:
fix check for
skipability of work
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merge-rec
u
rsive: ma
k
e
"Auto-merging" comme
n
t sho
w
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah N
e
wren
m
e
rge-rec
u
r
s
ive: fix re
m
ainder
of wa
s
_dirty() to
u
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge
-
r
ecu
r
s
i
ve: fix was_t
r
ac
k
ed(
)
to quit lyin
g
wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t6046: testcases checkin
g
w
he
t
her updat
e
s can be skipped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge-recurs
i
v
e
:
a
v
o
i
d tr
i
g
g
ering
a
d
d_cacheinfo error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-re
c
ursive: mov
e
more i
s
_dir
t
y handling t
o
merge_co
n
t
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-re
c
ursive: improve a
d
d_cachein
f
o error hand
l
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah
N
ewren
merge-recurs
i
ve: avoid spur
i
ous rename
/
rename
c
onfl
i
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
dir
e
ctory rename detection: n
e
w
test
c
ases showca
s
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge
-
recursive:
f
ix remaining
directory rename +
d
irty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newr
e
n
me
r
ge-recu
r
sive: fix overwr
i
t
i
ng dirty f
i
l
es involved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah
Newren
me
r
ge-recursive: avoid
c
l
obbering untracked
files with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah Newren
merge-recu
r
sive: apply nec
e
s
sary
modifications
f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursive: when
c
omparing files,
d
on't include
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merge-recurs
i
ve: check for file
l
evel conflict
s
then
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merge-recursive: add computation o
f
collisions
due
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: chec
k
for d
i
re
c
tor
y
level c
o
n
f
licts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newr
e
n
m
e
rg
e
-recursive: add
g
et_directory
_
renames()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: make a h
e
lper functi
o
n for cleanup
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
me
r
ge-
r
ecursive: sp
l
i
t
o
ut code for dete
r
m
ining diff_filepairs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
jah Ne
w
r
e
n
me
r
ge-re
c
ursive: make !o->detect
_
r
ename c
o
d
epath more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
me
r
ge-recursive
:
fix leaks o
f
a
l
lo
c
ated r
e
names and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
w
r
en
merge-recursive: introduce new fun
c
tio
n
s t
o
han
d
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
merge-recursive: move
t
h
e
get_renames() function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detection: t
e
sts for handl
i
ng ov
e
r
w
ri
t
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
e
n
d
i
recto
r
y re
n
ame det
e
ction: t
e
s
ts fo
r
h
a
ndling over
w
rit
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
N
e
w
ren
directory
re
n
a
me det
e
ctio
n
: mi
s
c
e
llaneous testcase
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
direct
o
ry rename d
e
tection: tes
t
case
s
exploring
p
os
s
ibly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory
r
ename detection: m
o
re involved e
d
ge/c
o
rn
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
directo
r
y r
e
name
detection: test
c
ases checki
n
g whic
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
d
i
r
e
ctory rename det
e
ction: file
s
/dir
e
ctories in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
direct
o
ry rename
detection: partially r
e
n
a
m
e
d
di
r
ec
t
ory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
di
r
ectory ren
a
m
e detection:
t
es
t
cases to
avoid ta
k
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
directory rename
det
e
c
t
io
n
: d
i
rectory
s
p
l
itting test
c
ase
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
directory
rename
de
t
ect
i
on: bas
i
c testcas
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ham
a
no
Mer
g
e br
a
nc
h
'svn/authors-prog-2' of git://b
o
gom
i
ps
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Junio C Haman
o
Reve
r
t "Merge branch 'en/rename-directory-detection'"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
i
o C Hamano
The t
h
ird batch for 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge
b
r
anch 'eb/cred-helper-ignore-sigp
i
pe'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
M
e
rge b
r
anch 'lv/tls-1
.
3'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C Hamano
Merge branch 'pk/
t
e
s
t-avo
i
d-pipe
-
hi
d
ing-exit-status'
commit
|
commitdiff
|
tree
2018-04-11
J
unio C
Ha
m
ano
Me
r
ge branch
'
rs/stat
u
s-with-remov
e
d-sub
m
odule'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Mer
g
e branch 'nd/combined-
t
est-helper'
commit
|
commitdiff
|
tree
2018-04-11
J
u
n
io C Hamano
Mer
g
e branch
'
sb/packfi
l
es-in-repo
s
itory'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
H
a
m
ano
Merge
b
ranch
'
sb/
o
bject-
s
tore'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch 'jc/test-must-be-empty'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C Hamano
M
e
rge branch 'cc/pe
r
f-aggregate-
s
or
t
'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
M
e
rge branch 'ab
/
doc-hash-b
r
ok
e
nness'
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C Hamano
Merge branch 'bc/ha
s
h-independent-tests'
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C H
a
mano
Merge branch 'ab/
d
rop-con
t
rib
-
e
x
a
m
ples'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hama
n
o
The second batch for 2
.
1
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge branch 'ys/bisect-object-i
d
-m
i
ssing-c
o
nversi
o
n
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ham
a
no
M
erge
b
ranch 'yk/filte
r
-br
a
n
c
h-no
n
-
comm
i
ttish-refs'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merg
e
branch 'nd/t
r
a
c
e
-
with-
e
nv'
commit
|
commitdiff
|
tree
2018-04-10
J
u
n
io C Hamano
Merge branch '
n
d/pars
e
o
pt
-
comple
t
ion-more'
commit
|
commitdiff
|
tree
2018-04-10
Junio C H
a
mano
Merg
e
br
a
n
ch 'ds/bsearch
-
hash'
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o
C Ha
m
ano
Me
r
ge br
a
nch '
w
s/
r
ebase
-
p
'
commit
|
commitdiff
|
tree
2018-04-10
Junio C
H
amano
M
erge
br
a
n
ch 'jk/di
f
f
-
h
i
ghligh
t
-
g
raph-fix'
commit
|
commitdiff
|
tree
2018-04-10
J
unio
C Hama
n
o
Merge branc
h
'
n
d
/remove-ignore-env-f
i
eld'
commit
|
commitdiff
|
tree
2018-04-10
Junio C H
a
mano
Merge
br
a
n
c
h
'
p
s
/contains-
i
d-error-message'
commit
|
commitdiff
|
tree
2018-04-09
Ju
n
io C Hamano
Th
e
fir
s
t batch
f
or 2
.
18 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-09
Junio C
Haman
o
Mer
g
e bran
c
h 'tg/st
a
s
h-untr
a
cked-wit
h
-pathspec-fi
x
'
commit
|
commitdiff
|
tree
2018-04-09
Ju
n
io C Hama
n
o
Merge branch 'nd
/
worktree-
p
r
une'
commit
|
commitdiff
|
tree
2018-04-09
Juni
o
C
Hamano
Merge
b
ran
c
h 'bc/object-
i
d'
commit
|
commitdiff
|
tree
2018-04-09
J
unio C Ham
a
n
o
Merge b
r
an
c
h 'ma/shortlog-revparse'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Ha
m
ano
M
erge branc
h
'a
b
/inst
a
ll-sym
l
i
n
k
s'
commit
|
commitdiff
|
tree
2018-04-09
Junio
C
H
a
m
ano
Merge branch
'ml/filter-branch-no-op-error'
commit
|
commitdiff
|
tree
2018-04-09
J
unio C Hamano
Merge branch 'ab/pcre-v2'
commit
|
commitdiff
|
tree
2018-04-09
J
u
nio C Ham
a
no
Merge
branch 't
i
/fetch-eve
r
ything-local-optim
'
commit
|
commitdiff
|
tree
2018-04-09
Junio
C
Hamano
Merge bran
c
h
'en/r
e
name-d
i
r
ec
t
ory-de
t
ecti
o
n
'
commit
|
commitdiff
|
tree
2018-04-02
Junio C
H
am
a
no
Git 2
.
17
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-02
Juni
o
C Hama
n
o
Merge tag
'l10n-2
.
17
.
0-rnd1' of git://git
h
ub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
Jun
i
o C
Hamano
Merge
branch 'pw
/
add-p-s
i
n
gle'
commit
|
commitdiff
|
tree
2018-04-01
Ævar Arn
f
jörð Bjarm
a
son
add
-p: fi
x
2
.
1
7
.
0-rc* reg
r
e
ssion due to moved
c
o
d
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Junio
C Hamano
Mer
g
e b
r
anch 'jh/parti
a
l-clone'
commit
|
commitdiff
|
tree
2018-03-29
Jonathan Ni
e
der
upload-pack: disable object fi
l
ter
i
ng when
d
isab
l
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Erik E Brad
y
cred
e
nt
i
al: ignore SIGPIPE when writing t
o
c
r
edential
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Loganaden Velvi
n
dron
http: a
l
low
use of
TLS 1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
R
e
né Scharfe
submodul
e
:
c
h
e
ck for NULL r
e
t
urn of get_
s
u
b
mod
u
le_ref_store()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Junio
C Hamano
Git 2
.
17-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Junio
C
Hamano
M
e
r
g
e branch 'tg/stash
-
doc-ty
p
ofix'
commit
|
commitdiff
|
tree
2018-03-28
Ju
n
io C Hamano
Merge branch 'p
c
/submo
d
u
le-hel
p
er'
commit
|
commitdiff
|
tree
2018-03-28
Junio C Hamano
Merge bran
c
h '
n
d/parseopt-completion'
commit
|
commitdiff
|
tree
2018-03-28
P
ratik Ka
r
ki
t
e
st: avoid pi
p
es
in git related commands
f
o
r
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Stefan Be
l
l
er
submod
u
le dei
n
i
t
: handle non e
x
isting pathspecs
g
racefully
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Th
o
mas Gummerer
git-stash
.
txt:
r
emove
extra squar
e
bra
c
ket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arnfjörð Bjarmason
doc
hash
-
fun
c
tion-transition:
c
la
r
ify wha
t
S
H
Attered
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Ar
n
fjör
ð
Bjarmason
doc
h
ash-
f
unction-transition:
c
l
a
rify how old
e
r
g
its
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
SZEDER Gábor
te
s
t_must
_
be_emp
t
y: s
i
m
plif
y
file e
x
ist
e
nce check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Christian Couder
p
erf/
a
g
g
regate: add --sort-
b
y=regre
s
s
i
on option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Christian Couder
pe
r
f/aggreg
a
t
e
: add display_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t/
h
elper: merge
tes
t
-write-cach
e
in
t
o t
e
st-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
N
g
u
y
ễn Thái Ngọ
c
Du
y
t
/helper: merge tes
t
-wildmatch into
t
est-too
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
N
g
uyễn
T
hái
Ngọc Duy
t/helper: merge test
-
urlmat
c
h-normal
i
zation into test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next