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-recursive: avoid clobbering untracked files with directory renames
2018-02-27
Eli
j
a
h
N
e
w
ren
m
erge-recu
r
siv
e
:
avoid clobbe
r
ing untracked files with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-
r
ecursive: apply n
e
c
e
ss
a
r
y mo
d
ifications
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-re
c
ursive: wh
e
n
compar
i
ng
f
iles, don't incl
u
de
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recur
s
ive: ch
e
ck
f
o
r fi
l
e l
e
vel conflicts then
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: add co
m
p
u
tation
of collisi
o
n
s due
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
merge-re
c
u
rsive: check for d
i
rect
o
ry level conflict
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
merge-rec
u
rsive:
add g
e
t_
d
i
r
e
ctory_r
e
names()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
mer
g
e-
r
e
cursive:
mak
e
a helper functio
n
f
or cleanup
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive:
s
plit out code for deter
m
ining diff_fi
l
ep
a
irs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah
N
ewren
m
e
rge-
r
ecursive: make !o->d
e
tec
t
_rename codepath mo
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
merge-recursive:
fix leaks of allo
c
ated
renames
a
nd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newre
n
merge-recu
r
sive: introduce ne
w
func
t
ion
s
t
o handle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
merge-
r
ec
u
rsive: mov
e
the get_re
n
ames()
functi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newr
e
n
directory
rename detect
i
on:
t
e
s
t
s for hand
l
ing over
w
riting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename d
e
tecti
o
n: tests f
o
r h
a
ndlin
g
ov
e
rwriting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewre
n
director
y
re
n
ame detection: miscellaneous
testcase
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
Ne
w
r
e
n
dire
c
tory
r
en
a
me detection:
te
s
tcases exp
l
oring
possibly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
di
r
ectory r
e
name
d
etection: more involv
e
d
edge/corner
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
jah Newren
directory
r
e
name dete
c
tion: testcases checking which
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newr
e
n
dir
e
ctory renam
e
detection: files
/
dir
e
ct
o
rie
s
in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
a
h
Ne
w
r
e
n
d
i
r
e
ctory
rename detection
:
part
i
ally renamed directory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
di
r
ectory ren
a
me detection:
t
estcases to avo
i
d takin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
direct
o
r
y
rename
de
t
ection: directory
s
plitti
n
g
testcases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
direct
o
ry re
n
ame de
t
ecti
o
n: basic testcases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
me
r
ge-recursive: a
d
d explanation for src_entry and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-19
Eli
j
a
h Ne
w
ren
merge-recursive: fix
l
ogic
orderin
g
issu
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-19
E
l
ija
h
Newren
Tighten and correct a f
e
w t
e
stcase
s
fo
r
m
e
rg
i
ng and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-17
Ju
n
io C H
a
mano
Git 2
.
16
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-16
J
u
nio C Ham
a
no
M
e
rg
e
tag 'l10n
-
2
.
1
6
.
0-rnd2'
of git:/
/
github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-01-12
SZEDER Gábor
Re
l
N
o
tes: minor typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-11
Jun
i
o
C Hamano
G
it 2
.
16-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-11
Jun
i
o C Hamano
Merge branch '
j
h
/objec
t
-filte
r
ing'
commit
|
commitdiff
|
tree
2018-01-11
Junio C Haman
o
Merge
b
ran
c
h
'
tg/wo
r
ktree-c
r
eat
e
-tracking'
commit
|
commitdiff
|
tree
2018-01-11
J
u
nio C Hama
n
o
M
erge branch 'js/test
-
with-ws-in-path'
commit
|
commitdiff
|
tree
2018-01-11
Ral
f
Thielow
D
o
c
u
mentation/git-
w
orktr
e
e
.
txt: add missin
g
`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-10
Beat B
o
ll
i
t3900: add s
o
me
more quotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-10
J
unio
C
Hamano
R
e
lNot
e
s update before -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-10
Junio C Hama
n
o
Merge
branch 'js
/
perl-
p
ath-workaround
-
in-
t
e
sts'
commit
|
commitdiff
|
tree
2018-01-10
Ju
n
i
o C
Hamano
Merg
e
b
r
anch 'ew/em
p
ty-
m
er
g
e-with-di
r
ty
-
inde
x
'
commit
|
commitdiff
|
tree
2018-01-10
Junio
C Hamano
Mer
g
e
branch 'ma/bis
e
ct
-
leakfix'
commit
|
commitdiff
|
tree
2018-01-10
Junio C
Hamano
Merge branch 'js/f
i
x-me
r
ge-arg-quoting-in-reb
a
s
e
-
p
'
commit
|
commitdiff
|
tree
2018-01-10
Johannes Schinde
l
in
mi
n
gw: handle
G
ITPERLLIB in t0021 in a Wind
o
ws-compatible way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
J
unio C
H
amano
M
e
rge b
r
anch 'j
k
/
d
oc-dif
f
-options'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge bran
c
h 'bw
/
pr
o
tocol-v1'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hama
n
o
Merge b
r
a
n
ch 'sg/travi
s
-check-untracked
'
commit
|
commitdiff
|
tree
2018-01-09
Juni
o
C
H
amano
Mer
g
e branch 'js/te
s
t-
w
ith-ws-in-path'
commit
|
commitdiff
|
tree
2018-01-09
J
unio C Hamano
Mer
g
e branch 'bc/submit
t
ing-patches-in-a
s
ciidoc'
commit
|
commitdiff
|
tree
2018-01-09
J
unio C Hamano
Merge branch
'
sg/travis-skip
-
identical
-
t
e
st'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Haman
o
M
e
r
ge branch 'a
b
/dc-s
h
a1-loose-ends'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge b
r
anch 'sg/travis-fixes
'
commit
|
commitdiff
|
tree
2018-01-09
Ju
n
io C Hamano
Merge bra
n
ch 'js/misc-git-gui-stuff'
o
f
.
.
/git-gui
commit
|
commitdiff
|
tree
2018-01-09
Jo
h
annes
Schindelin
git-gui: allo
w
Ctrl+T to tog
g
le mu
l
t
iple pa
t
hs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
Johannes Schinde
l
in
git-gui: fix exce
p
tion
when trying to
s
tage
w
it
h
empt
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
J
o
hannes Schin
d
elin
git-g
u
i: a
v
oid exception up
o
n
C
trl+T in an empty list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
Jo
h
annes Schindel
i
n
git gui: fix st
a
ging
a second
line to
a
1-l
i
ne
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
J
u
nio
C
Ha
m
ano
Merg
e
bra
n
ch 'e
w
/em
p
ty-merge-with-
d
irty-index-ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2018-01-09
J
unio C Ha
m
ano
merge
-
recursiv
e
: d
o
not look at the index
duri
n
g recursive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-08
Th
o
ma
s
G
u
mmerer
oid
s
et:
d
o
n't return value
from
oidset_init
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Git 2
.
16-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-05
J
u
n
i
o C Hamano
Merge b
r
an
c
h '
j
s
/s
e
quence
r
-cleanups
'
commit
|
commitdiff
|
tree
2018-01-05
Ju
n
io C
H
amano
Mer
g
e
b
ra
n
c
h 'jh/me
m
ihas
h
-opt'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Merge branch 'tb/test-lin
t
-wc-l'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Merge b
r
anc
h
'
r
s/use-arg
v
-array-in
-
c
hil
d
-proc
e
ss'
commit
|
commitdiff
|
tree
2018-01-05
J
u
n
io C Hamano
Merg
e
branch 'l
d
/p4-mult
i
ple
-
shelves'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Merge branch 'jd/
f
ix-strbuf-add-u
r
lencode-bytes'
commit
|
commitdiff
|
tree
2018-01-05
Jun
i
o C Hamano
M
erge br
a
n
c
h
'ew
/
empty-mer
g
e-wi
t
h-di
r
ty-index'
commit
|
commitdiff
|
tree
2018-01-05
J
unio
C
H
a
mano
Merge
b
ranch 'db/d
o
c-conf
i
g-section-names-wi
t
h
-bs'
commit
|
commitdiff
|
tree
2018-01-05
Junio C
Haman
o
Merge branch 'jk
/
test-su
i
t
e-tracing
'
commit
|
commitdiff
|
tree
2018-01-05
J
o
hanne
s
Schind
e
lin
reba
s
e -p: fi
x
q
uot
i
ng
w
hen cal
l
in
g
`
g
i
t m
e
rge`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-04
Jeff
Kin
g
doc
s
/dif
f
-opt
i
ons: clarify scope of diff-filter types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-04
Todd Zullinger
htt
p
: fix
v
1
p
rotocol tes
t
s with ap
a
che
h
ttpd < 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
Joh
a
n
n
e
s Schi
n
delin
t0
3
02 & t3900: add
f
orgotte
n
quotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
Joh
a
nnes Sch
i
n
delin
Allow the
t
e
s
t
s
uite to
p
ass in
a
di
r
ectory whose name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
Æ
var
A
r
nfj
ö
rð Bjarmason
bisect: fix a regression causing a segf
a
ult
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
Todd Zullinge
r
doc/SubmittingPatches: improve text format
t
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
SZEDER G
á
bor
tra
v
is
-
ci: c
h
eck that all build artifacts are
.
gitignore-d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
SZ
E
DER Gábor
travis-ci:
d
on't stor
e
P4 a
n
d
G
it LFS in the working
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-02
SZEDER Gáb
o
r
travi
s
-
ci: record an
d
ski
p
su
c
ce
s
sfully built trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-02
SZED
E
R
Gábor
travis-ci: create th
e
ca
c
he direct
o
ry earl
y
in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-02
SZEDER Gábor
travis-ci: print the "tip of b
r
anch is e
x
actly at tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Git 2
.
16-r
c
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-28
Junio
C
Hamano
Merg
e
branch 'sb/describe-b
l
ob'
commit
|
commitdiff
|
tree
2017-12-28
Juni
o
C Hamano
M
e
rge branch 'h
i
/merge-veri
f
y-sig-config'
commit
|
commitdiff
|
tree
2017-12-28
Junio C
Hamano
Merge branch 'ws
/
cur
l
-htt
p
-proxy-over-https'
commit
|
commitdiff
|
tree
2017-12-28
Juni
o
C Hamano
Merge branch 'ks/do
c
-
p
revi
o
u
s-check
o
ut'
commit
|
commitdiff
|
tree
2017-12-28
J
unio C Hamano
Merge branch 'ks/rebase-erro
r
-me
s
sages
'
commit
|
commitdiff
|
tree
2017-12-28
Junio
C Hama
n
o
Merge b
r
anch 'sr/http
-
sslverify-config-doc'
commit
|
commitdiff
|
tree
2017-12-28
J
u
nio C Hamano
Merge bra
n
c
h 'nm/imap
-
s
e
n
d
-quote-serve
r
-f
o
ld
e
r-name
'
commit
|
commitdiff
|
tree
2017-12-28
Junio C
Hamano
Merge
branch '
b
p/fsmonitor'
commit
|
commitdiff
|
tree
2017-12-28
J
unio C Hamano
Merge bra
n
ch
'
jh
/
partial
-
clone-doc'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge branch
'
jt
/
trans
p
o
r
t-hide-vtable'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Ha
m
ano
Mer
g
e br
a
nc
h
'
j
s/enhanced-version-
i
nfo
'
commit
|
commitdiff
|
tree
2017-12-28
Juni
o
C Hamano
Merge branch 'tz/li
b
-git-svn-svn
s
erve
-
tests
'
commit
|
commitdiff
|
tree
2017-12-28
Junio C
H
a
mano
Merge branch 'e
w
/
s
vn-crl
f
'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge bran
c
h
'c
c
/skip-t
o
-
o
ptional-val'
commit
|
commitdiff
|
tree
2017-12-28
Junio C
Ham
a
no
Merge
b
ranc
h
'
ra/pro
m
p
t
-ere
a
d-fix'
commit
|
commitdiff
|
tree
2017-12-28
Juni
o
C Hamano
Merg
e
bran
c
h 'bw/pat
h
-
doc'
commit
|
commitdiff
|
tree
2017-12-28
Ævar
Arnfjö
r
ð
Bjarmason
M
a
kef
i
le: NO_OPENSS
L
=1 s
h
ould no l
o
nger
i
mply BLK_SHA1=1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-27
Johannes Schindel
i
n
se
q
uencer: do not invent whit
e
space when
t
r
ansforming
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-27
Johannes Schindelin
s
equencer: rep
o
rt when n
o
op has an argume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next