repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: ensure we write updates for directory-renamed file
2018-02-27
Elijah N
e
wren
merge
-
rec
u
rsive: e
n
sur
e
we writ
e
up
d
ates fo
r
directory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah Newren
m
erge-re
c
ursive:
a
void sp
u
rious renam
e
/renam
e
c
o
nflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
N
ewr
e
n
direc
t
ory rename detection: new
testcas
e
s sho
w
casin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newren
merg
e
-re
c
ursiv
e
:
fix remaining direct
o
r
y rena
m
e
+ d
i
r
ty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah Newren
m
e
rge-re
c
ursive: fix
o
verwriting dirty files
i
nvolved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
E
lijah
Newren
me
r
ge-recursive: av
o
id clobbe
r
ing untracked files with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newre
n
merge-recursiv
e
: apply
necessar
y
modification
s
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursi
v
e:
when comparing file
s
, don't include
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
ah Newren
merge-r
e
cu
r
s
i
ve:
c
heck for f
i
le level con
f
licts then
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
merge-recurs
i
ve: add computatio
n
of c
o
llisions due
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merg
e
-recu
r
sive: check fo
r
directory leve
l
co
n
flicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
rge-re
c
urs
i
ve: a
d
d get_directory_re
n
ames()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
rge-
r
ecursive: ma
k
e a helper function for cleanu
p
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-recursive: split out code for
d
eter
m
in
i
ng diff_filepairs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
mer
g
e-recursive: make !o->detect_renam
e
codepath mo
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
m
erge-
r
e
cursive: fix
leaks of allocated renames and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
N
e
w
ren
me
r
ge-recursiv
e
:
intro
d
uc
e
new fun
c
tions to handle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
mer
g
e-recurs
i
v
e
: move th
e
g
e
t_renam
e
s() function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dire
c
tory rena
m
e detection:
tests f
o
r handling overwritin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
directory rename detection: tests
for handling ov
e
rwriting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
directory rena
m
e
detection: miscellaneou
s
testcases
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah N
e
wren
d
irectory r
e
name d
e
te
c
tion:
test
c
ases exploring
p
ossibly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
directory rename detection:
m
ore invol
v
ed
edge/corner
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
w
r
e
n
dire
c
t
ory rename detecti
o
n:
t
estc
a
s
es checking w
h
ich
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Ne
w
ren
directory r
e
n
ame det
e
c
tion: files/dire
c
tories in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
Newren
d
irectory rename detection: partially
renamed directory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
directory rename detection: t
e
stcases to av
o
i
d taking
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
N
ewren
d
i
rector
y
rena
m
e detection:
d
irec
t
or
y
sp
l
itting
tes
t
cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
d
i
rectory rena
m
e detecti
o
n:
basic testcases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merg
e
-
r
ecursive: ad
d
explanat
i
o
n for
s
rc_entry and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-19
Elij
a
h Newren
merge-recursive:
f
ix
logic ordering i
s
sue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-19
E
l
ija
h
N
e
wren
Tigh
t
en and cor
r
ect a few
t
e
stcase
s
fo
r
merging 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
H
amano
Me
r
ge tag 'l10n-
2
.
16
.
0-rnd2' of git
:
/
/
github
.
com
/
g
i
t
.
.
.
commit
|
commitdiff
|
tree
2018-01-12
SZEDER Gábor
RelNotes: minor typofi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-11
Junio
C
Hamano
G
i
t 2
.
16-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-11
Junio
C Ha
m
ano
M
erge
b
ranch 'jh/ob
j
ect
-
filte
r
ing'
commit
|
commitdiff
|
tree
2018-01-11
Juni
o
C Hamano
Mer
g
e branch 'tg/wo
r
kt
r
ee-cr
e
ate-tracking'
commit
|
commitdiff
|
tree
2018-01-11
Juni
o
C Hamano
Merge br
a
n
ch 'js/test-with-ws-in-path'
commit
|
commitdiff
|
tree
2018-01-11
Ralf Thie
l
ow
D
ocumentation/g
i
t-worktree
.
txt: add
m
issing `
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-10
Beat Bol
l
i
t3900: add so
m
e
more quotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-10
Ju
n
io C
H
am
a
n
o
RelNotes up
d
ate before -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-10
J
unio C
H
a
mano
Me
r
ge branc
h
'js/perl-path-workaround-in-test
s
'
commit
|
commitdiff
|
tree
2018-01-10
Jun
i
o C Hamano
M
erge
b
r
anch 'ew/
e
m
pty-merge-w
i
th-
d
irty-ind
e
x'
commit
|
commitdiff
|
tree
2018-01-10
Junio
C
Hamano
Merge
br
a
nch 'ma/bi
s
ect-leakf
i
x'
commit
|
commitdiff
|
tree
2018-01-10
J
u
nio C
Hamano
Merge bran
c
h 'js/fix-merge
-
arg-quoting-in-rebase-p'
commit
|
commitdiff
|
tree
2018-01-10
Jo
h
annes Schind
e
lin
mingw: handle GITP
E
RLLI
B
i
n
t
002
1
in
a
Windows-com
p
atible way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge branch '
j
k/doc
-
diff-options'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hama
n
o
Merge branch
'bw/pro
t
ocol-v1'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge
branch 'sg/travis-check-untracked'
commit
|
commitdiff
|
tree
2018-01-09
Junio C
H
amano
Merge branch 'js/test
-
with-ws-i
n
-
p
ath'
commit
|
commitdiff
|
tree
2018-01-09
Ju
n
io C Hamano
Merg
e
bra
n
ch 'bc/submi
t
ting-patche
s
-
i
n-asciidoc'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge branch
'sg/travis
-
skip-identical-test'
commit
|
commitdiff
|
tree
2018-01-09
J
u
nio C Hamano
Merg
e
b
ranch
'
ab/dc-s
h
a1-loose-ends'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
M
e
rge
b
ranch 'sg/
t
r
avis-fixes'
commit
|
commitdiff
|
tree
2018-01-09
Junio
C Hamano
Merge branch 'js/misc-
g
it-gui
-
stuff' of
.
.
/
gi
t
-g
u
i
commit
|
commitdiff
|
tree
2018-01-09
J
o
h
anne
s
Sch
i
nde
l
in
git-gui: allow Ctrl+T to toggle multipl
e
pa
t
hs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
Johan
n
es Sc
h
i
n
delin
git-
g
ui: f
i
x excepti
o
n whe
n
tryi
n
g to stage wit
h
empty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
Joh
a
nnes Schindelin
gi
t
-g
u
i
:
avoid e
x
c
eption upon
C
trl+T in an empty lis
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
Johannes Schindelin
git g
u
i: fix st
a
g
i
ng a sec
o
nd line to a 1-l
i
ne fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
Ju
n
io
C
Hamano
Merg
e
b
ran
c
h
'
ew/empty-merg
e
-wi
t
h-dirty-ind
e
x-ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2018-01-09
Juni
o
C Hamano
mer
g
e-recur
s
ive: do not look
a
t
the
i
ndex duri
n
g recursi
v
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-08
Th
o
mas Gummerer
oidset: don't retur
n
val
u
e f
r
om oidse
t
_
i
n
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-05
J
u
nio C H
a
mano
Git
2
.
16-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Merge br
a
nch 'js/sequen
c
er-cleanups
'
commit
|
commitdiff
|
tree
2018-01-05
Junio C
H
aman
o
M
e
rge branch
'
j
h/m
e
mi
h
a
s
h
-opt'
commit
|
commitdiff
|
tree
2018-01-05
J
u
nio C
H
a
ma
n
o
Merge branch 'tb/test-lint-wc-l'
commit
|
commitdiff
|
tree
2018-01-05
Jun
i
o C
Hamano
Merg
e
branc
h
'
rs/
u
se-argv-array-
i
n-child-process'
commit
|
commitdiff
|
tree
2018-01-05
Jun
i
o C Hamano
Me
r
g
e bran
c
h 'ld/
p
4-multiple-shelves'
commit
|
commitdiff
|
tree
2018-01-05
Junio
C Ham
a
n
o
M
er
g
e branch 'jd/f
i
x-
s
trbuf-add-urlencode-bytes'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
M
erge
branch 'ew/empt
y
-merge-with-dir
t
y
-inde
x
'
commit
|
commitdiff
|
tree
2018-01-05
Junio
C Hamano
Merge
branch 'db/doc
-
co
n
f
ig-sect
i
on-
n
ames-with-bs'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
M
e
rge branch 'jk/
t
es
t
-s
u
ite-tracing'
commit
|
commitdiff
|
tree
2018-01-05
Johannes Schinde
l
in
rebase -p: fix q
u
oting when c
a
lling `git merge`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-04
Jeff King
d
ocs/d
i
f
f
-options: clar
i
fy
s
cope of diff-f
i
lter types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-04
Todd Zulli
n
g
er
http: fix v1 protoc
o
l tests with apache httpd < 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
J
o
hannes Schindelin
t0302 &
t
3
900:
add
forgotten quotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
Johannes Schindelin
Allow the te
s
t
suite
t
o
p
as
s
in
a directory
whose nam
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
Ævar A
r
n
f
j
örð Bjar
m
ason
b
i
sect: fix a
regression causin
g
a
segfault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
T
o
d
d Zulling
e
r
d
o
c/SubmittingPatches: improve text forma
t
ting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
SZEDE
R
G
á
bor
travis
-
ci: ch
e
ck that all build artifacts
are
.
giti
g
n
ore-d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
SZEDER Gá
b
or
t
r
avi
s
-ci: don't store P4 and Git LFS in
t
h
e working
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-02
S
Z
E
D
ER Gábor
trav
i
s-ci: r
e
c
ord and s
k
i
p
suc
c
e
s
sfu
l
l
y
b
uilt trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-02
S
Z
E
DER Gábor
tr
a
vis-ci
:
create the cache
d
irectory e
a
r
l
y in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-02
SZ
E
DE
R
Gábor
travis-ci: print the "tip
o
f branch is
exactly
a
t
t
ag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-28
Ju
n
io C Hamano
Git 2
.
16-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-28
J
u
nio
C
H
amano
Merge branch '
s
b/describe-bl
o
b'
commit
|
commitdiff
|
tree
2017-12-28
Junio C
H
a
m
a
no
Merge branch 'hi/m
e
rge-verify-sig-c
o
nfig
'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge branch 'ws/curl-http-pro
x
y-over-https'
commit
|
commitdiff
|
tree
2017-12-28
J
u
nio
C Ha
m
ano
Merge
br
a
n
ch '
k
s
/doc
-
pre
v
ious-checko
u
t'
commit
|
commitdiff
|
tree
2017-12-28
J
unio C Hamano
Mer
g
e bra
n
ch 'ks/reba
s
e-error-me
s
sages'
commit
|
commitdiff
|
tree
2017-12-28
Junio C H
a
mano
Me
r
ge
b
r
anch 's
r
/http-sslv
e
r
i
fy-config-doc'
commit
|
commitdiff
|
tree
2017-12-28
J
unio
C Hamano
Merge branc
h
'
n
m/imap
-
sen
d
-quot
e
-server-f
o
lder-n
a
me
'
commit
|
commitdiff
|
tree
2017-12-28
Jun
i
o C Hamano
Merge b
r
anch
'
b
p
/fs
m
onitor'
commit
|
commitdiff
|
tree
2017-12-28
Juni
o
C Hamano
M
e
rge b
r
anch 'j
h
/partia
l
-clo
n
e-doc'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Ham
a
no
Merge branch 'jt/transport-hide
-
vtabl
e
'
commit
|
commitdiff
|
tree
2017-12-28
Junio
C Hamano
Merg
e
branch 'js/enhanc
e
d-version-info'
commit
|
commitdiff
|
tree
2017-12-28
Jun
i
o
C
Hamano
Merge b
r
anch 'tz/lib-git-svn-sv
n
serve-
t
ests'
commit
|
commitdiff
|
tree
2017-12-28
Ju
n
io C Hamano
Mer
g
e branc
h
'ew/svn-cr
l
f'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Ha
m
ano
Merge branch '
c
c/skip
-
to-optional-val'
commit
|
commitdiff
|
tree
next