repo.or.cz
/
git
/
gitster.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: move more is_dirty handling to merge_content
2018-05-08
Elijah Newren
m
e
r
ge-recu
r
sive: move m
o
re is_di
r
t
y
hand
l
ing to merge_content
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newre
n
merge-recursive: improv
e
add_cacheinfo erro
r
h
a
n
dling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
me
r
ge-recur
s
iv
e
: avoid spuriou
s
rena
m
e/ren
a
me conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah New
r
en
directory ren
a
me detection:
n
e
w test
c
ases showcasing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursive:
f
ix remainin
g
direct
o
ry r
e
name +
d
irty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix overwriting dirty f
i
les in
v
olv
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-
r
ecursive: avoid
c
lobber
i
ng untracke
d
files
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
lija
h
Newre
n
merge-recursive: apply ne
c
es
s
ary modificati
o
ns for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-recursive: when compa
r
ing
f
iles,
d
on't i
n
clude
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge
-
recursive: check for file level conflicts then
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
lija
h
Newren
merge-rec
u
rsive: add c
o
mp
u
tation
o
f collisions du
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newr
e
n
merge-recursive: check
f
or directory leve
l
conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive:
add get_dire
c
t
ory_renames()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
ah
N
ew
r
en
merge-recursive
:
m
ake a helper functi
o
n
f
o
r
c
l
e
a
n
up
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
ah Newre
n
m
erge-
r
ecursiv
e
: split
out code for determ
i
ning diff_filepairs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
me
r
ge-
r
ecurs
i
v
e: make !o->detect_re
n
ame c
o
depath more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
m
erge-recursive: fix leak
s
of allocated renames and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
mer
g
e-recursive
:
introduce new functions to handle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Ne
w
ren
merge-recursive: move th
e
get_
r
e
names() function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rena
m
e
detectio
n
:
t
e
sts for handling
overwriting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
directory r
e
name detect
i
on
:
tests
for handlin
g
ov
e
rwr
i
ting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
Newren
directory
r
e
n
ame detecti
o
n: miscellaneo
u
s
t
est
c
ases
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah
N
ew
r
e
n
d
irectory rename detecti
o
n: tes
t
ca
s
es exploring possibly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
directory renam
e
detecti
o
n
: more
involved edge/
c
orn
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
w
ren
directo
r
y r
e
name dete
c
t
i
on:
t
e
stcase
s
checki
n
g which
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
e
n
dire
c
tory r
e
nam
e
d
etection: files/directories in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory re
n
ame detecti
o
n: par
t
ially renamed di
r
ectory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
Newren
di
r
ectory re
n
am
e
detec
t
ion:
tes
t
cases to a
v
oid
taking
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newr
e
n
directory rename detecti
o
n: di
r
ectory spl
i
tting
testcase
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
direct
o
ry renam
e
detection:
b
a
sic tes
t
c
a
ses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Haman
o
Me
r
ge branch 'svn/authors-prog-2' of gi
t
://bogomips
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
R
evert "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
Juni
o
C Hama
n
o
The third ba
t
ch for 2
.
1
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hama
n
o
Mer
g
e
branc
h
'eb/cred-helper-ignore-sigpipe'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C Hamano
Merge branch 'lv/
t
ls-1
.
3'
commit
|
commitdiff
|
tree
2018-04-11
Junio C H
a
mano
Merge
b
ranch
'p
k
/test-avoid-pipe-hidi
n
g-exi
t
-st
a
tus'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branc
h
'rs/status-with-removed-su
b
m
o
dule'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge
b
ranc
h
'nd/comb
i
ned-te
s
t
-helper'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge bran
c
h 'sb/
p
ackfiles-
i
n-r
e
positor
y
'
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
i
o C Hamano
Merge branch 'sb/object-sto
r
e'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C Hamano
Merge bra
n
ch 'j
c
/test-must-b
e
-emp
t
y'
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
i
o C Hama
n
o
M
er
g
e
b
ranch 'cc/perf-a
g
gregate-sort'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
M
e
rge branch 'ab/do
c
-has
h
-brokennes
s
'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Mer
g
e
b
ranch 'bc/hash-independent-tests'
commit
|
commitdiff
|
tree
2018-04-11
J
u
n
i
o C Hamano
M
e
rg
e
b
ranch '
a
b/drop-contrib-examples
'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
The
s
e
c
o
nd batch for
2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-10
Ju
n
io C Ha
m
ano
M
erge branch 'ys/b
i
s
ect-object-id-m
i
ssin
g
-conversion
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Junio C
H
ama
n
o
Mer
g
e branch '
y
k/filte
r
-branch-n
o
n
-
comm
i
tt
i
sh-refs'
commit
|
commitdiff
|
tree
2018-04-10
Ju
n
io C H
a
mano
Merge branch
'nd/
t
race-w
i
th-env'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ham
a
no
Merge branch 'nd/
p
arseopt-compl
e
tion-m
o
re'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge branch
'
d
s
/
bsearch
-
hash'
commit
|
commitdiff
|
tree
2018-04-10
Junio
C Hamano
Merge br
a
nch '
w
s/reb
a
se-p'
commit
|
commitdiff
|
tree
2018-04-10
Junio C H
a
m
ano
Merge branch '
j
k/diff-high
l
ight-grap
h
-fix
'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merg
e
branch 'nd/remove-ignore-env-field'
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o C
H
a
mano
Merg
e
bran
c
h
'
ps/contains-id-error-
m
e
ssage'
commit
|
commitdiff
|
tree
2018-04-09
Ju
n
i
o
C Ham
a
no
Th
e
fi
r
st batch f
o
r 2
.
18 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-09
Jun
i
o C Hama
n
o
Merge bran
c
h
'
tg/s
t
ash-un
t
r
acked-with-pathspec-fix'
commit
|
commitdiff
|
tree
2018-04-09
J
unio
C Ham
a
no
Merge
branch 'nd/w
o
rktree-
p
rune'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge br
a
n
ch 'bc/object
-
i
d
'
commit
|
commitdiff
|
tree
2018-04-09
J
u
nio C Hama
n
o
Me
r
g
e
b
r
anch 'ma/shortlog-r
e
vparse'
commit
|
commitdiff
|
tree
2018-04-09
Jun
i
o C Hamano
M
erge branch 'a
b
/
i
nstall-symlinks'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
Hamano
Merge branch 'ml/filter-branch-no-op-err
o
r'
commit
|
commitdiff
|
tree
2018-04-09
J
u
n
io C Haman
o
Merge branch 'ab/pcre-v2'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
H
amano
Merge bra
n
ch 'ti/fetch-everything-local-optim'
commit
|
commitdiff
|
tree
2018-04-09
Junio
C
H
a
ma
n
o
Merge branc
h
'en
/
rename-direc
t
ory-detect
i
on'
commit
|
commitdiff
|
tree
2018-04-02
Junio C Hama
n
o
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
.
1
7
.
0-rnd1' of git://git
h
ub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
Junio C Hamano
Merge bran
c
h 'pw/ad
d
-p-single
'
commit
|
commitdiff
|
tree
2018-04-01
Ævar Arnfjö
r
ð Bjarmason
add
-
p: f
i
x 2
.
17
.
0-r
c
* re
g
r
e
ssion d
u
e to
m
oved code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Jun
i
o C Hamano
Mer
g
e branch 'jh/par
t
ial
-
c
lone'
commit
|
commitdiff
|
tree
2018-03-29
J
o
na
t
han Nieder
u
p
load-pack: d
i
s
a
ble objec
t
filterin
g
whe
n
disab
l
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Erik E
B
r
ady
credenti
a
l:
i
gn
o
re SIGPIPE
w
hen writi
n
g
to cred
e
n
t
ial
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Lo
g
anaden Ve
l
v
i
n
d
ron
h
ttp: a
l
low use of TLS 1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ren
é
S
charfe
submodule: chec
k
f
or NULL return of get_submodule_ref_stor
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Junio C Ham
a
no
Git 2
.
1
7-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Junio C Haman
o
Me
r
ge branch 'tg/stash-doc-
t
ypofi
x
'
commit
|
commitdiff
|
tree
2018-03-28
Junio C Hama
n
o
Merge branc
h
'pc/submo
d
ule-help
e
r'
commit
|
commitdiff
|
tree
2018-03-28
Junio C
Hamano
Merge b
r
an
c
h 'nd/p
a
rseo
p
t
-
completio
n
'
commit
|
commitdiff
|
tree
2018-03-28
Pratik Karki
test: avoid pipe
s
in git re
l
a
t
ed commands fo
r
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Stef
a
n Belle
r
submodule deinit:
handle non e
x
ist
i
n
g
p
athspecs gr
a
c
e
fully
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
T
h
omas Gummer
e
r
git-stash
.
txt
:
remove extra sq
u
are bracke
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ævar
Arnfjörð Bjarmason
doc ha
s
h-func
t
i
o
n-tr
a
nsiti
o
n: clari
f
y what SHAt
t
ered
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arnfjörð Bjarmason
d
o
c hash-function-transit
i
o
n: cl
a
rify how older git
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
S
Z
EDER Gábor
test_mu
s
t_b
e
_empty: simplify f
i
le
existence check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
C
h
r
istian Couder
perf/a
g
gregate: add --sort-by=regression option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
C
hristia
n
Couder
perf/aggregate: ad
d
display_
d
ir()
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:
m
erge test-write-cache into
test-
t
ool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
N
gu
y
ễn
T
hái
Ngọc Duy
t/helper: merge test-
w
i
l
dmatch into
test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
N
g
uyễn Thái Ngọc Duy
t/helper:
m
e
rge te
s
t-urlmatch-normalization into 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
per: merge test-subprocess
i
n
to test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
N
g
uyễn Thái Ngọc Duy
t/helper: merge
test-
s
ubmodule-config i
n
to
test-tool
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 test-string
-
l
i
st into test-t
o
ol
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái
N
gọc Duy
t
/
h
e
lper: merge tes
t
-strcm
p
-offs
e
t into t
e
st-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
l
p
er
:
m
e
r
g
e
t
est-sigch
a
in 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/helpe
r
: merge test-s
h
a1-ar
r
ay into test-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/he
l
per:
m
erge test-scrap-
c
ache-tree 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: me
r
ge test-ru
n
-command into test-tool
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
test-revisio
n
-walking
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/
h
elper: m
e
rge test-regex into test-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: m
e
rge
test-ref-sto
r
e into t
e
s
t
-
t
ool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next