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: avoid clobbering untracked files with directory renames
2018-05-08
Elijah Newren
merge-recursive: avo
i
d c
l
obbering
u
n
tracked fi
l
es wi
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
me
r
ge-recu
r
sive: apply ne
c
e
s
s
a
r
y modifications for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursive: when comparin
g
f
iles, don't
i
nclude
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
El
i
j
ah New
r
en
m
e
r
g
e
-recursive: ch
e
ck for f
i
le level conflicts then
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-rec
u
rsive:
add com
p
utation of c
o
llisi
o
ns d
u
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h Newren
m
erge-r
e
cursive:
c
heck for direct
o
ry
l
e
vel conf
l
ict
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merg
e
-recur
s
ive: add get_directory_renam
e
s()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merg
e
-recur
s
ive: make a helper function for cleanup
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah
N
ewren
me
r
ge-recu
r
sive:
spl
i
t
out code for det
e
rmi
n
in
g
diff_filepairs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
r
e
n
merge-
r
ecursive: ma
k
e !o->de
t
ect_rename codepath more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
m
erge-recursive:
f
ix leaks of
allocated renames and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Ne
w
ren
merge-recursive: intr
o
duce new fu
n
ct
i
on
s
t
o
handle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
mer
g
e-recursive: move the get_renames() fun
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h N
e
wren
directo
r
y rename detec
t
i
o
n: tests
f
or handling ov
e
rwriting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename det
e
c
t
ion: tests f
o
r h
a
n
d
ling overwritin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
directory rename det
e
ction: miscellaneous testcases
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
re
c
t
ory rename
de
t
ection
:
t
estcas
e
s exploring
p
os
s
ibly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
directory
rename detection
:
more in
v
olved edge
/
co
r
ner
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h New
r
e
n
direct
o
ry
r
enam
e
d
e
tection: testcases checkin
g
whic
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
di
r
e
c
tory
r
ename detect
i
on: files
/
dir
e
ct
o
r
i
es
i
n the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
director
y
rename detection
:
part
i
ally re
n
amed dire
c
tory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
dire
c
tory rename detection
:
testcases to avoid taking
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
direct
o
ry rename detection: directory
s
plitting testcases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
e
wren
direc
t
ory
r
ename detection: basic test
c
a
s
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C
H
amano
Merge bra
n
ch 's
v
n/authors-
p
r
o
g-2' of git://b
o
gomips
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Revert "Merge branch 'en/rename-direc
t
ory-det
e
ction'"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Jun
i
o C Hamano
The th
i
rd batch for 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Hamano
M
e
rge branch
'eb/cred-h
e
lper-ignore-sigpipe'
commit
|
commitdiff
|
tree
2018-04-11
J
unio
C
H
a
man
o
Merge branch 'lv/tls-1
.
3'
commit
|
commitdiff
|
tree
2018-04-11
J
u
n
io C Hama
n
o
Mer
g
e bran
c
h 'pk/test-avoi
d
-pipe-hiding-exit-status'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ham
a
no
Merge b
r
anc
h
'rs/status-with-removed-submodule'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ham
a
no
Merge b
r
anch 'nd/co
m
bined-test-he
l
p
e
r'
commit
|
commitdiff
|
tree
2018-04-11
J
unio
C
H
amano
Merge branch 'sb/
p
ac
k
f
iles-in-repository'
commit
|
commitdiff
|
tree
2018-04-11
Junio C H
a
mano
Merge branch 'sb/
o
bject
-
s
t
ore'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ha
m
ano
M
erge branch
'
jc/test-must-be-empty'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C
H
amano
Mer
g
e b
r
anch 'cc
/
perf-aggregate-sort'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hama
n
o
Merge bra
n
ch '
a
b/doc-hash
-
br
o
kenness
'
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C Hamano
Merge
branch 'bc/hash
-
independ
e
nt-tes
t
s'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
M
e
rge branc
h
'ab/d
r
op-cont
r
i
b
-
examples'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ham
a
no
The second batch for 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-10
Junio C H
a
mano
M
e
rge
branch 'ys/bisec
t
-object-
i
d-miss
i
ng-conve
r
sion
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge branch '
y
k/fil
t
er-b
r
anch-non-committish-refs'
commit
|
commitdiff
|
tree
2018-04-10
Junio C H
a
m
ano
Merg
e
branch
'
n
d
/
tra
c
e-with-env'
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o C Hamano
Me
r
ge br
a
nch 'nd/parseo
p
t-completion-more'
commit
|
commitdiff
|
tree
2018-04-10
Junio C
Ha
m
ano
Merge bran
c
h 'ds/bsearch-has
h
'
commit
|
commitdiff
|
tree
2018-04-10
Junio C
H
aman
o
Merge bra
n
ch 'ws/rebase
-
p'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge branch 'jk/diff-highlight
-
graph-fix
'
commit
|
commitdiff
|
tree
2018-04-10
J
u
n
io C Hama
n
o
M
e
rge branch 'nd/r
e
mov
e
-ignore-env-field'
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o C Hama
n
o
Me
r
ge branch '
p
s/co
n
tains
-
id-err
o
r
-
message'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Ham
a
n
o
The first batch f
o
r 2
.
18
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-09
Ju
n
io C Hamano
Merge
b
ranch 't
g
/sta
s
h-
u
ntra
c
ked-with-pathspec-fi
x
'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge branch 'nd
/
workt
r
e
e-prune'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge
b
ran
c
h 'bc/object-id'
commit
|
commitdiff
|
tree
2018-04-09
Jun
i
o C
Hamano
Mer
g
e branch 'ma/shortlog-revparse'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge branch 'ab/install-symlin
k
s'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hama
n
o
Merge br
a
nch 'ml/filter-branch-no-op-e
r
ror'
commit
|
commitdiff
|
tree
2018-04-09
Junio
C Haman
o
Merge bran
c
h 'ab/pcre-v2'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Haman
o
M
e
r
ge br
a
nch 'ti/fetch
-
e
verything-loca
l
-
optim'
commit
|
commitdiff
|
tree
2018-04-09
J
unio C Ha
m
ano
M
erge b
r
anch 'e
n
/renam
e
-directory-de
t
ection'
commit
|
commitdiff
|
tree
2018-04-02
Jun
i
o C H
a
mano
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
/
g
it
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
Junio C
Hamano
M
e
r
ge branch
'pw/add-p-sing
l
e
'
commit
|
commitdiff
|
tree
2018-04-01
Ævar Arnfj
ö
r
ð Bj
a
rma
s
o
n
add
-
p: fix 2
.
17
.
0
-
rc* regression due
t
o
moved code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Junio C Hama
n
o
Merge br
a
nch 'jh/partia
l
-clone'
commit
|
commitdiff
|
tree
2018-03-29
Jonath
a
n Ni
e
der
upload-pa
c
k: di
s
able o
b
ject fil
t
ering when
d
i
sabled
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Erik E Brady
cred
e
ntial
:
ignore SIGPIPE
when writing to credential
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Loganaden Velvi
n
dron
http: al
l
ow use of T
L
S 1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
René Schar
f
e
submo
d
u
le: c
h
ec
k
for NUL
L
retu
r
n of get_
s
ubmodule_ref
_
s
tore()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Junio C Hamano
Git
2
.
1
7
-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Jun
i
o C Hamano
Merge branch 'tg/st
a
s
h-doc-
t
ypofix'
commit
|
commitdiff
|
tree
2018-03-28
Junio C H
a
man
o
Merge bra
n
ch 'pc/submo
d
ule-helper'
commit
|
commitdiff
|
tree
2018-03-28
Juni
o
C Hama
n
o
Merge bra
n
c
h 'nd/pars
e
opt-compl
e
tion'
commit
|
commitdiff
|
tree
2018-03-28
P
r
atik Ka
r
ki
te
s
t: avoi
d
p
i
p
es
i
n
git
r
elated commands for test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
St
e
fan Be
l
ler
submod
u
le deinit: h
a
ndle non existing pathspecs
g
ra
c
efully
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Th
o
m
as Gummerer
git
-
stash
.
txt:
r
emove extra s
q
uare bracke
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Æv
a
r
Arnfjörð Bjarm
a
son
doc
hash-function
-
tra
n
sit
i
on: c
l
arify what SHAttered
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Æv
a
r
Ar
n
fjörð
B
jarmason
do
c
hash
-
funct
i
on-transition: c
l
arify
how o
l
der gi
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
SZED
E
R
Gábor
t
est_mu
s
t_be_empty: simplify fi
l
e e
x
i
s
tence check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Christia
n
Couder
per
f
/aggregate: ad
d
--sort
-
b
y=r
e
gressio
n
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Christian Co
u
der
perf/aggregate:
a
dd d
i
s
play_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Ng
u
yễn Thái Ngọc Duy
t
/
helper: merge t
e
st-write
-
cache into te
s
t-t
o
ol
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Th
á
i Ngọc Duy
t
/
hel
p
er: merge test-
w
ildmat
c
h in
t
o test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Ngu
y
ễ
n
Thái N
g
ọc Duy
t/h
e
lper: merge te
s
t-url
m
atch-normalization
i
nto test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t/he
l
p
e
r: merge test-subpr
o
c
ess into t
e
st-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguy
ễ
n Thái
N
gọc Duy
t/hel
p
er: me
r
ge test-
s
u
b
module-c
o
nfig
i
nto test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t
/
h
e
lper: merge
test-string-lis
t
into t
e
s
t
-t
o
ol
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t/helper: merge test-strcm
p
-o
f
fset into test-to
o
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
N
g
uyễn Thái
N
g
ọc
D
uy
t/hel
p
er: merge
t
e
st-sigchain in
t
o test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t/help
e
r: m
e
rge te
s
t-sha1-array into test-t
o
ol
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thá
i
Ngọc D
u
y
t/helper: merge test-scr
a
p-ca
c
he
-
tree into test-
t
ool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t
/
helper: merge
test-run-comm
a
nd into te
s
t-t
o
ol
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t/help
e
r:
m
e
rge
test-
r
evision-walking
i
n
to tes
t
-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn
Thái
N
g
ọc Duy
t/helper: merge test-regex into test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái N
g
ọc Duy
t/help
e
r: mer
g
e test
-
ref-sto
r
e
i
nt
o
test-tool
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
lper: merg
e
test
-
read-ca
c
he into test-to
o
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thá
i
Ngọc
Du
y
t/h
e
lper
:
merg
e
test-prio-queue into tes
t
-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguy
ễ
n T
h
ái Ngọc Duy
t/h
e
lpe
r
: merge t
e
s
t-path-utils into test-too
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguy
ễ
n
Thái Ngọ
c
Duy
t/hel
p
er:
merge test-on
l
i
n
e-cp
u
s into test-
t
ool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn
T
hái Ngọc Duy
t/help
e
r
: merge test-mktemp i
n
to te
s
t-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn T
h
ái N
g
ọc Duy
t/h
e
lper: mer
g
e
(unuse
d
) te
s
t
-m
e
rgesort int
o
test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next