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-02-27
Elijah Newren
m
erge-recursive: av
o
id
clob
b
e
r
ing untracked
fil
e
s
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
merge-recurs
i
ve: apply necessar
y
modifications for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recur
s
ive:
w
hen co
m
paring files, do
n
't include
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-
r
ecursive: c
h
eck
for
f
ile level confli
c
ts then
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: add computation
o
f c
o
llisions
due
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
merge-recursive: che
c
k for direc
t
ory
l
e
v
el
c
onflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
merge-
r
ecur
s
ive: add get_direc
t
ory_renames()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Ne
w
ren
m
e
r
g
e-recursi
v
e: ma
k
e a
help
e
r function for
cleanup
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah N
e
wren
merge-recursive:
split out code
for d
e
termining di
f
f_filep
a
irs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah
Newren
m
e
rge-recursive:
m
ake
!
o->detect_r
e
name cod
e
path mor
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
merge
-
recursi
v
e:
f
ix leaks
o
f allocated renames an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
merge-recursi
v
e
:
i
n
trod
u
c
e
new functions
to handle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
a
h Newren
merge
-
r
e
cursi
v
e
:
move the get_rena
m
es() functio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
director
y
r
ename de
t
ection
:
t
ests for han
d
l
ing ov
e
rwriting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
irectory rename detecti
o
n: tests for handling overwriting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
N
e
wre
n
director
y
re
n
ame detection: misc
e
llaneous testc
a
s
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Ne
w
ren
dire
c
tory renam
e
detec
t
ion: testcases exp
l
oring possibly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Ne
w
r
e
n
d
i
rectory rename
de
t
ection: more involv
e
d edge/corner
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
dire
c
tory rena
m
e de
t
ection: t
e
stcases checking
whi
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
i
r
ec
t
or
y
rename detection: files/
d
i
r
ectorie
s
in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename
detection
:
partially
renamed
directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
direc
t
ory
r
e
n
ame de
t
ection: testc
a
ses
to
a
void t
a
k
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah N
e
wr
e
n
dire
c
tory rename detection:
d
i
r
ector
y
s
plitting testcases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah
N
ew
r
en
directory ren
a
me dete
c
tion: basic test
c
ases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-19
Elij
a
h Newren
mer
g
e
-recursive: add ex
p
lanati
o
n for sr
c
_entr
y
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah New
r
en
merge
-
recursiv
e
:
fix logi
c
ordering issue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-19
E
l
ijah Newren
Ti
g
h
t
en and co
r
re
c
t a fe
w
testcases f
o
r
mergi
n
g and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-17
Junio
C Hamano
Git 2
.
16
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-16
Junio C Hamano
Merge ta
g
'l
1
0
n
-2
.
1
6
.
0-r
n
d
2' of git:
/
/github
.
c
om
/
gi
t
.
.
.
commit
|
commitdiff
|
tree
2018-01-12
SZEDER
G
á
bor
RelNotes: m
i
nor
t
ypof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-11
J
unio C Hamano
Gi
t
2
.
1
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-11
Junio C Hamano
M
e
rge branc
h
'
jh/object-filt
e
ring'
commit
|
commitdiff
|
tree
2018-01-11
Junio C Hamano
Merge bra
n
ch
'
tg/wor
k
tree-create-trackin
g
'
commit
|
commitdiff
|
tree
2018-01-11
Junio C Haman
o
Me
r
ge b
r
anch 'j
s
/
t
e
s
t-w
i
th-ws-
i
n-path
'
commit
|
commitdiff
|
tree
2018-01-11
Ralf Thi
e
lo
w
Docu
m
e
ntatio
n
/git-worktree
.
txt:
add
m
issing
`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-10
Beat B
o
lli
t3900: add s
o
me
more quotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-10
Junio C H
a
mano
Re
l
N
otes
update
befor
e
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-10
J
u
nio
C
Hamano
Merge
branc
h
'js/perl-pat
h
-work
a
round-i
n
-
tests'
commit
|
commitdiff
|
tree
2018-01-10
Junio C
Hamano
M
er
g
e branch 'ew/emp
t
y-me
r
ge-with-di
r
ty-index'
commit
|
commitdiff
|
tree
2018-01-10
Junio
C Ha
m
ano
Merge branch '
m
a/bis
e
ct-lea
k
fix'
commit
|
commitdiff
|
tree
2018-01-10
Ju
n
i
o
C Ha
m
an
o
M
er
g
e
branch
'js/fix-merge-arg-
q
uoting-in-r
e
base-p
'
commit
|
commitdiff
|
tree
2018-01-10
Johannes Sch
i
ndelin
mingw: ha
n
dle G
I
TPER
L
LIB in t0021
in a Windo
w
s-compatib
l
e way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Junio C H
a
mano
Me
r
ge branch 'jk/doc-di
f
f-options'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
M
e
rge branch
'
b
w/protoco
l
-v1'
commit
|
commitdiff
|
tree
2018-01-09
Junio C H
a
m
a
no
M
erge bran
c
h
'
s
g/travis-check-untracked'
commit
|
commitdiff
|
tree
2018-01-09
J
unio C Hamano
Merg
e
br
a
nch '
j
s/test-
w
i
th-ws-
i
n-path'
commit
|
commitdiff
|
tree
2018-01-09
J
u
nio
C
H
amano
Merge
b
r
anch '
b
c/submitting
-
p
a
tch
e
s-in-a
s
ciidoc'
commit
|
commitdiff
|
tree
2018-01-09
J
u
nio
C
Haman
o
Merge branch 'sg
/
travis-sk
i
p-ide
n
tical-test'
commit
|
commitdiff
|
tree
2018-01-09
Ju
n
io C Ham
a
no
M
e
rge
branch 'a
b
/d
c
-sha1-loos
e
-
e
nds'
commit
|
commitdiff
|
tree
2018-01-09
Junio C
H
amano
Merge branch 'sg/
t
ravis-fixes'
commit
|
commitdiff
|
tree
2018-01-09
Juni
o
C Haman
o
Merge br
a
nch 'j
s
/mis
c
-g
i
t
-
gui-st
u
ff' of
.
.
/git-
g
ui
commit
|
commitdiff
|
tree
2018-01-09
Jo
h
annes Schinde
l
i
n
g
it-gui: allow Ctrl
+
T
t
o t
o
g
g
le multi
p
le
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Johannes Schindelin
git-g
u
i:
f
ix exception when try
i
ng to
sta
g
e with empty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Johanne
s
Schindelin
git-g
u
i: avoid e
x
ception upon Ctrl+T in an empty
list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Jo
h
an
n
es Schindelin
gi
t
gui: fix staging a second li
n
e
t
o
a 1-line file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Junio
C H
a
mano
Merg
e
b
ranch '
e
w/empty-mer
g
e-
w
ith-
d
irty-i
n
dex-main
t
.
.
.
commit
|
commitdiff
|
tree
2018-01-09
Jun
i
o
C
Haman
o
merge-recursi
v
e: do not look a
t
the
index during
r
ecursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-08
T
h
oma
s
G
u
mm
e
rer
oid
s
et: don't return
v
alue from oids
e
t
_
init
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-05
J
u
nio C
H
amano
Git
2
.
1
6
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-05
J
u
nio
C
Ha
m
a
no
M
er
g
e branch 'js/se
q
uencer-cle
a
nups'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
M
erge br
a
nch 'jh/memihash-o
p
t'
commit
|
commitdiff
|
tree
2018-01-05
J
unio C Hama
n
o
Mer
g
e br
a
nch '
t
b/test-lint-wc-l'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Me
r
ge branch
'
rs/us
e
-argv-array
-
i
n
-c
h
ild-pr
o
c
e
ss'
commit
|
commitdiff
|
tree
2018-01-05
Junio C H
a
m
ano
M
erge branch
'ld/p4-mu
l
tiple-shelves
'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Ha
m
ano
Merge branch 'jd
/
fix-strbuf-add-urlencode-
b
ytes'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Haman
o
Merge branch 'e
w
/
empty-merge-
w
ith-dirty
-
ind
e
x'
commit
|
commitdiff
|
tree
2018-01-05
J
unio C Ha
m
ano
M
e
rge br
a
nch 'db/d
o
c-config
-
s
e
c
t
ion-nam
e
s-
w
ith-bs
'
commit
|
commitdiff
|
tree
2018-01-05
Junio C
Ham
a
no
M
erge b
r
anc
h
'j
k
/t
e
st-suite-tra
c
ing'
commit
|
commitdiff
|
tree
2018-01-05
Joha
n
nes Sch
i
ndelin
re
b
ase -p
:
f
ix
q
uotin
g
when
calling `git
m
e
r
g
e`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-04
Jeff Ki
n
g
do
c
s/diff-options: clarify scope
o
f
diff-filter types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-04
Todd Zullinger
h
t
tp: fix v
1
p
r
otocol
tests w
i
th apa
c
he http
d
<
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
Johannes Schindelin
t03
0
2 & t3900
:
add for
g
otten
q
u
otes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
J
o
hann
e
s
Schindel
i
n
A
l
low the tes
t
suit
e
to pas
s
i
n a d
i
re
c
tor
y
w
hose name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
Ævar Arnfj
ö
rð Bj
a
rmaso
n
b
isect: f
i
x
a
regression ca
u
sing a s
e
gf
a
ul
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
T
o
dd Zullin
g
er
doc/Subm
i
ttingPat
c
h
e
s: i
m
prove
t
ext formattin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
SZEDER Gábor
travis-ci: check t
h
a
t
all build artifacts are
.
g
i
t
i
g
nore-d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
S
Z
EDER Gábor
t
r
avis-
c
i: don'
t
store P4 and
Git LF
S
i
n
the
w
orking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-02
S
Z
ED
E
R Gábor
travis-
c
i: r
e
cord and skip su
c
cessfully
built
t
re
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-02
SZEDER Gábor
travis-ci: create the ca
c
he directory early in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-02
SZED
E
R Gáb
o
r
t
r
a
v
is-
c
i:
p
rint the "tip o
f
branch is exact
l
y
a
t
tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
G
it
2
.
16-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-28
Jun
i
o C Haman
o
Merge bra
n
ch
'
s
b/de
s
cribe-bl
o
b'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Ha
m
ano
Me
r
g
e
branch 'hi/merge-verify-sig-config'
commit
|
commitdiff
|
tree
2017-12-28
Junio
C Hamano
Merge
branch 'ws/curl-htt
p
-proxy-over-
h
ttps'
commit
|
commitdiff
|
tree
2017-12-28
J
u
nio C Hamano
Merge
bra
n
ch 'ks/doc-previ
o
us-che
c
kout'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
M
erge branch
'
ks
/
rebas
e
-error-messages'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge branch 'sr/http-sslverify-config-d
o
c'
commit
|
commitdiff
|
tree
2017-12-28
Junio C
Ha
m
a
n
o
M
erge branch 'nm/imap-send-quote-s
e
rver-folder-name'
commit
|
commitdiff
|
tree
2017-12-28
Juni
o
C Hamano
M
e
rge branch 'bp/fsmonit
o
r'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Mer
g
e branch
'jh
/
partia
l
-clone-d
o
c'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge branch
'jt/tran
s
por
t
-hi
d
e-
v
table'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hama
n
o
Mer
g
e b
r
anch 'j
s
/enhanced-version-info'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Ham
a
no
M
e
r
ge branch 'tz/
l
i
b
-
g
it-
s
vn-svns
e
rve-tes
t
s'
commit
|
commitdiff
|
tree
2017-12-28
Junio C
H
am
a
no
M
e
rge
b
ran
c
h '
e
w/svn-crlf'
commit
|
commitdiff
|
tree
2017-12-28
Junio
C
Hamano
Mer
g
e
b
ran
c
h
'cc/skip-to-optional-val'
commit
|
commitdiff
|
tree
2017-12-28
Juni
o
C Hamano
Merge branch '
r
a/pro
m
p
t
-er
e
ad-fix'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge branch 'bw/pa
t
h
-doc
'
commit
|
commitdiff
|
tree
2017-12-28
Ævar Arnfjö
r
ð Bjarmason
Mak
e
file: NO_
O
PENSSL=1 shoul
d
no longer imply BLK_SHA1
=
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
Joh
a
nnes Schindelin
sequencer: do not
i
n
ven
t
whitespace w
h
e
n
transforming
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
Johannes Schindelin
sequencer: report when noop
has an argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next