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: fix check for skipability of working tree updates
2018-05-08
Elijah Newren
merge-recursiv
e
:
fix check
for skipability of working
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newr
e
n
me
r
g
e-r
e
cur
s
ive: make "Auto-merging" comment show fo
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah
Newren
merge-recu
r
sive:
fix remainder of wa
s
_dirty() to use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
j
ah Newren
merge-
r
e
cursive:
f
ix was_tracked() to quit l
y
ing
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
t6046: testcases
c
h
e
cking
w
hether upda
t
es can be skipped
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merge-rec
u
rsiv
e
:
a
void trigge
r
ing add_cacheinfo error
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newr
e
n
m
e
r
g
e
-
recursive: move
m
ore is_d
i
rty
h
andling to merge
_
content
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-
r
ecursive: improve ad
d
_cacheinfo e
r
ror handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah New
r
en
merge-
r
ecursi
v
e
: a
v
oid sp
u
r
iou
s
rename
/
rename conflic
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
e
n
directory rename de
t
ection
:
new testcases showca
s
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah New
r
en
merge-r
e
cursive: fix remainin
g
dire
c
tory rename + dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merge-recursive: fix overwriting dir
t
y files involved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
merge-r
e
cursive: avoid
c
lobbering u
n
tracked fil
e
s
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursive: appl
y
nec
e
ssary modifi
c
ations for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah N
e
wren
merge-recursive
:
wh
e
n comparing f
i
les,
don
'
t
incl
u
de
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
m
erg
e
-recursive: check for file level confl
i
cts then
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-rec
u
r
s
ive: ad
d
c
o
mputation o
f
collisions d
u
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah
N
ew
r
en
mer
g
e-recursive
:
check for
d
irecto
r
y
l
e
ve
l
conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-r
e
cursiv
e
: a
d
d ge
t
_directory_
r
e
n
ame
s
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
lija
h
Newren
m
e
rge-recur
s
ive: make
a
helper func
t
ion for cleanu
p
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
merge-r
e
cursive: split
out
c
o
de for d
e
termining diff_filepair
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
li
j
ah Newren
merge-recursiv
e
: ma
k
e
!o->detect_rename c
o
depath
m
ore
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
mer
g
e-recursive: fix leaks of allocated r
e
names and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: introdu
c
e n
e
w functions to handle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
merge-recursive
:
move the get_renames() f
u
nc
t
io
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detecti
o
n: tests
for
h
andlin
g
overwriting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
di
r
e
c
tory rename detection: tests fo
r
handling over
w
riting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newre
n
directory r
e
name
dete
c
t
i
on: mi
s
c
e
l
laneous t
e
stcases
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
direc
t
o
ry rename detection:
t
estcases
e
x
ploring
p
os
s
ibly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
lij
a
h N
e
wr
e
n
d
ire
c
tory
r
e
n
a
me
d
ete
c
tion:
m
ore in
v
o
lved edge/corn
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ij
a
h Newren
director
y
ren
a
me
d
etectio
n
: testcases check
i
ng which
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
Newren
dire
c
tory
r
ename detection: files/dir
e
ctories
in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
Newren
directory
ren
a
me detec
t
ion: partially re
n
a
med
directory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directo
r
y rename detection:
t
e
stcases
to
a
v
oid
taking
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
d
irectory re
n
ame
d
etection: directory splitting testcases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direc
t
ory rename de
t
ection: bas
i
c testcas
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
io C
H
amano
Merge branc
h
's
v
n
/
a
u
t
h
ors
-
prog-
2
' of
g
it://bog
o
mips
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Hamano
Revert "Merge branc
h
'en/rename-direct
o
ry-detection'
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Th
e
third batch for 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Hamano
Merge branch '
e
b/cred-he
l
pe
r
-ignore-sigpi
p
e
'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C Hamano
Merge
b
ranc
h
'lv/tls-
1
.
3'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C Hamano
Mer
g
e branch
'
pk/test-avoid
-
pipe-hiding-exit-
s
tatus'
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C Ham
a
no
Merge bran
c
h 'rs/status-with
-
rem
o
ved-su
b
mo
d
ule'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Hamano
Merge branch 'nd/combined-test-helper'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch 'sb/packfi
l
es-in-re
p
ository'
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C Hamano
M
e
rge b
r
anc
h
'sb/object-store'
commit
|
commitdiff
|
tree
2018-04-11
J
unio C Hama
n
o
Merge branch 'jc/test-must
-
be
-
empt
y
'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch
'cc/perf-aggre
g
ate-s
o
rt'
commit
|
commitdiff
|
tree
2018-04-11
Jun
i
o C H
a
mano
Me
r
ge br
a
nch
'
ab
/
doc-
h
ash
-
brokenness'
commit
|
commitdiff
|
tree
2018-04-11
Jun
i
o
C Hamano
Merge branch 'bc/hash-indepe
n
d
e
n
t-tests'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch '
a
b/
d
rop-contrib-examples'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
The
second
batch fo
r
2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Me
r
ge
branch 'y
s
/bisect-object-id-missing-conversion
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Me
r
g
e branch 'yk/filte
r
-branch-non-c
o
m
mi
t
tish-refs
'
commit
|
commitdiff
|
tree
2018-04-10
Junio
C
Haman
o
Merge branch 'n
d
/trace-with-env'
commit
|
commitdiff
|
tree
2018-04-10
Junio
C
Hamano
M
e
rge branch 'nd/parseopt-completion-more'
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C Hamano
Mer
g
e branch 'ds/bsearch-ha
s
h
'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ham
a
no
M
e
rge branch 'ws/re
b
ase-p
'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Mer
g
e branch 'jk/
d
iff-h
i
ghlig
h
t
-
graph
-
fix'
commit
|
commitdiff
|
tree
2018-04-10
J
uni
o
C Hamano
Merge br
a
nch 'nd/remove-ignore-env-f
i
eld'
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C Hamano
Merge branch 'ps/contains-id-error-mess
a
ge'
commit
|
commitdiff
|
tree
2018-04-09
Juni
o
C Ham
a
no
The first bat
c
h for 2
.
18 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-09
Juni
o
C Hama
n
o
Merge branch 't
g
/
s
tash-untracke
d
-with-pat
h
spec-fix'
commit
|
commitdiff
|
tree
2018-04-09
J
u
nio C Hamano
Merge branch 'n
d
/w
o
r
k
tree-prune'
commit
|
commitdiff
|
tree
2018-04-09
J
u
nio C Hamano
Me
r
ge branch 'bc/o
b
ject-id'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge br
a
nch 'ma/
s
h
o
r
tlog-rev
p
arse
'
commit
|
commitdiff
|
tree
2018-04-09
Junio C H
a
mano
Merge b
r
an
c
h 'a
b
/install-symlinks'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge bran
c
h 'ml/filter-branch-no-op
-
e
r
ror'
commit
|
commitdiff
|
tree
2018-04-09
J
unio C Haman
o
Merge branch '
a
b/pcre
-
v2'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Ham
a
no
Merge branch
'
ti/fetch-everything-local-o
p
tim
'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
M
erge bran
c
h 'en/rename-dir
e
ctory-de
t
ection'
commit
|
commitdiff
|
tree
2018-04-02
Junio C Hamano
Git
2
.
17
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-02
Junio C H
a
mano
Merge tag 'l10n-2
.
17
.
0
-
rnd1' o
f
git:/
/
gi
t
hub
.
c
o
m/git
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
J
unio C Ha
m
ano
M
e
rge branch 'pw/add-p-single'
commit
|
commitdiff
|
tree
2018-04-01
Ævar Arnfjörð Bjarmason
add -p: fix 2
.
17
.
0-r
c
* reg
r
ession due to moved code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
J
unio C Hamano
Merge branch 'jh/partial-clone'
commit
|
commitdiff
|
tree
2018-03-29
Jonathan
Nieder
u
p
load-pa
c
k: disable object f
i
lte
r
i
n
g when disabled
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Erik E Brady
credenti
a
l: ignore SIGPIPE wh
e
n
w
r
i
t
ing to cre
d
e
n
tial
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Loganaden Velvindr
o
n
http: al
l
o
w use
o
f TLS 1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
René Sch
a
rf
e
submodule: check for NULL re
t
urn of get
_
s
ubmodu
l
e_ref_store()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Junio C
H
a
man
o
Git 2
.
17-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Junio
C
Hama
n
o
Merge bra
n
c
h 'tg/stash
-
doc-typof
i
x'
commit
|
commitdiff
|
tree
2018-03-28
J
unio C Hamano
Merge
b
r
a
nch '
p
c/su
b
module-helper'
commit
|
commitdiff
|
tree
2018-03-28
Ju
n
io C Hamano
Merge branch 'nd/
p
ar
s
eopt-com
p
l
e
tion'
commit
|
commitdiff
|
tree
2018-03-28
Pratik
Kark
i
test:
a
void pip
e
s in
g
it r
e
lated
c
o
mmands for test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
S
tefan Beller
submodule deinit: handle
non existing
p
athspecs gra
c
e
f
ul
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Thomas
G
u
mme
r
er
git-stash
.
txt: re
m
o
v
e
e
x
t
ra square bracket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arnfjörð Bjar
m
ason
doc hash-function
-
transition: clarify wha
t
SHAttered
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arnfjörð
B
jarmason
doc hash-function-tran
s
ition: clarify
h
o
w
o
lder gits
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
SZEDER
Gábor
t
e
s
t_must_b
e
_
empty:
simplify file
exis
t
ence check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Christian Couder
perf/aggregat
e
:
add --sort-b
y
=
regression option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Chri
s
t
ian Couder
perf/aggre
g
ate: add display_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Ngu
y
ễn Thái Ngọc Duy
t/he
l
per:
m
erge test-wri
t
e
-cache in
t
o test-to
o
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/helpe
r
: me
r
g
e test-wildmatc
h
into 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/helper: merge test-urlm
a
t
c
h-normalizatio
n
into test
.
.
.
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: mer
g
e test-subprocess into tes
t
-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/
h
elper:
merge test-submodule-config into t
e
st-too
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn
T
h
ái Ngọc Duy
t/helper: merge test-s
t
ring-list into tes
t
-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
/helper: m
e
rge test-s
t
rcmp-off
s
et i
n
to
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/hel
p
e
r: merge test-sigch
a
in
i
nto te
s
t-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next