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: use xstrdup() instead of fixed buffer
2018-06-14
René Scharfe
mer
g
e-re
c
ursive: use xstrdup() instead of fixed buffe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newren
merge-recursi
v
e: ensure we write updates fo
r
direct
o
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newr
e
n
m
e
rge-recurs
i
ve: av
o
id spurious renam
e
/rename
c
onflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah
N
e
w
ren
di
r
ecto
r
y rena
m
e d
e
tection: new testcase
s
showcasing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-
r
ec
u
r
sive: fix remaining
d
ire
c
tory rename + dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah Newren
m
e
rge-recursive
:
f
ix overwriting dirty fil
e
s i
n
v
o
lved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
Newren
m
e
rge-rec
u
r
s
ive
:
avoid clobbering untracke
d
files with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah Newren
me
r
g
e-recursive
:
ap
p
l
y necessary modifications for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
lij
a
h
Newre
n
me
r
ge-recursive: when c
o
mparing files, don't include
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
merge-re
c
ursive
:
check
fo
r
fi
l
e level conflic
t
s then
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
e
n
mer
g
e-
r
ecursive: a
d
d c
o
m
p
utation of collisions due
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ij
a
h Newr
e
n
merge-recu
r
sive: c
h
eck f
o
r directory level confl
i
cts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wr
e
n
merge-recur
s
ive: ad
d
get_directory_rena
m
e
s
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewre
n
m
er
g
e
-recursive: make a helper fu
n
c
t
ion for
c
l
eanup
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: spli
t
out cod
e
for determinin
g
dif
f
_filepairs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
merge-recursi
v
e: ma
k
e !o->
d
etect_rena
m
e codepath
more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newr
e
n
m
erge-recursive:
f
ix leaks of allo
c
a
ted
r
enames and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Ne
w
ren
m
e
r
ge-recursive: introduc
e
n
ew fu
n
ctions t
o
handle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Ne
w
ren
merge-recursive: move th
e
get_r
e
n
ames(
)
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dire
c
tory
r
ena
m
e
d
e
tection: tests
f
or
h
andlin
g
ov
e
rwriting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newr
e
n
directory re
n
ame
detection: te
s
ts for h
a
ndling overwritin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
directory rena
m
e detection: miscellaneous t
e
s
tcases
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
jah Ne
w
ren
dir
e
ctory ren
a
me
detect
i
on: testcases exploring p
o
ssibly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
directory r
e
n
a
me d
e
tecti
o
n
: mor
e
in
v
ol
v
ed edge/corner
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
directory rename
detection: testcases checking
w
hich
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
jah
N
ewre
n
directory rename d
e
tecti
o
n
:
fi
l
es/di
r
ectori
e
s in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename det
e
ction: partially renamed directo
r
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newre
n
dir
e
ctory r
e
name
d
ete
c
tion
:
testcases to avoid
takin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
directory rename
detection: directory split
t
ing testcases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
directory
rename detectio
n
: basic te
s
tcases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-recursive:
a
d
d
explan
a
tion for src_en
t
ry a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
me
r
g
e
-recu
r
sive
:
fi
x
logic
o
rdering
i
ssue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-19
Eli
j
ah Newren
Tig
h
ten and
co
r
rect a few testcases for merging and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-17
Ju
n
io
C Hamano
Git 2
.
16
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-16
Jun
i
o C
H
a
mano
Mer
g
e tag
'l10
n
-2
.
16
.
0-rnd2' of
git:/
/
github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-01-12
SZEDER Gábor
RelNotes: mino
r
typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-11
J
u
nio C Hamano
G
i
t 2
.
16-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-11
Jun
i
o
C Hamano
M
e
rge branch 'jh/object-f
i
l
t
ering'
commit
|
commitdiff
|
tree
2018-01-11
Junio C Ha
m
ano
Merge branch 'tg/
w
or
k
tre
e
-create-
t
racking'
commit
|
commitdiff
|
tree
2018-01-11
Jun
i
o C Ha
m
a
n
o
Merge branc
h
'js
/
t
e
st-with-ws-in-path'
commit
|
commitdiff
|
tree
2018-01-11
Ralf Thielow
Document
a
t
ion/git-
w
orktree
.
txt: add missing `
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-10
Beat Bolli
t3900: a
d
d s
o
me more q
u
otes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-10
J
u
n
i
o
C Hamano
RelNotes u
p
date
b
efore -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-10
Junio
C Hamano
M
e
r
g
e bran
c
h
'js/perl-pa
t
h-
w
ork
a
round-i
n
-tests'
commit
|
commitdiff
|
tree
2018-01-10
J
u
n
io C H
a
m
a
no
M
erge branch 'ew/empty-
m
erge
-
with-dir
t
y-
i
n
d
ex'
commit
|
commitdiff
|
tree
2018-01-10
Juni
o
C Hamano
Merge branch
'ma
/
bise
c
t
-
leakfi
x
'
commit
|
commitdiff
|
tree
2018-01-10
Junio C Haman
o
Merge b
r
anc
h
'js/f
i
x-merg
e
-arg-quot
i
ng-in-reb
a
se
-
p'
commit
|
commitdiff
|
tree
2018-01-10
Jo
h
annes Schindelin
min
g
w: h
a
ndle GITPERL
L
IB in
t0
0
21
i
n a
Windows-c
o
mpa
t
ible way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
Junio
C
Hamano
M
e
rge branch 'jk/d
o
c-dif
f
-optio
n
s'
commit
|
commitdiff
|
tree
2018-01-09
J
unio C H
a
mano
Merge
b
ranch 'bw/proto
c
ol-v1'
commit
|
commitdiff
|
tree
2018-01-09
J
unio C Hamano
Merge branch '
s
g/tra
v
is-che
c
k-un
t
r
a
cke
d
'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Ha
m
a
n
o
Merge
b
ranch 'j
s
/test-w
i
th-ws-
i
n-path'
commit
|
commitdiff
|
tree
2018-01-09
Junio
C
Hamano
Merge branch '
b
c
/
submitt
i
ng-patche
s
-in
-
a
sc
i
idoc'
commit
|
commitdiff
|
tree
2018-01-09
Junio
C
Hamano
Merge bra
n
ch 'sg/travis-ski
p
-ide
n
t
i
cal
-
test'
commit
|
commitdiff
|
tree
2018-01-09
Junio
C
Hamano
M
e
rge branch
'ab
/
dc-sha1-loose-ends'
commit
|
commitdiff
|
tree
2018-01-09
J
u
nio
C
Hamano
Me
r
ge b
r
anch '
s
g/travis-fixe
s
'
commit
|
commitdiff
|
tree
2018-01-09
J
u
nio C Hamano
Merge b
r
anch '
j
s/misc-g
i
t-gui-stuff
'
of
.
.
/git-gui
commit
|
commitdiff
|
tree
2018-01-09
Johanne
s
Schind
e
li
n
git
-
gui: all
o
w Ctrl+
T
to t
o
g
g
le multiple
p
a
t
hs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
Johann
e
s S
c
h
i
nd
e
lin
git-gui: fix
e
xception when
tryi
n
g to st
a
ge w
i
th e
m
pty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
Johannes Schindelin
git-gui: 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
Johannes Schinde
l
in
git gui
:
fix stagin
g
a second
l
ine to a 1-
l
ine file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
M
e
r
ge branch
'
ew/e
m
pty-merge-with-dirty-i
n
dex-ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2018-01-09
Ju
n
io C Ha
m
ano
merge
-
re
c
u
r
siv
e
: do not loo
k
at th
e
i
n
dex dur
i
ng recur
s
i
v
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-08
Th
o
mas Gumm
e
rer
oidset: don't retur
n
value fro
m
oidset_in
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-05
Junio 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
Me
r
ge
branch '
j
s
/sequencer-cleanups
'
commit
|
commitdiff
|
tree
2018-01-05
Jun
i
o C Hamano
M
erge
b
ranch 'jh/memihash-opt'
commit
|
commitdiff
|
tree
2018-01-05
J
u
nio C H
a
mano
Merge branch 'tb/test-l
i
nt-
w
c
-
l
'
commit
|
commitdiff
|
tree
2018-01-05
Junio C
Ham
a
no
Merge branch 'rs/use
-
argv-
a
rray-in-child-process'
commit
|
commitdiff
|
tree
2018-01-05
Juni
o
C Hamano
Merge branch '
l
d/p4-multiple-shelves'
commit
|
commitdiff
|
tree
2018-01-05
Junio
C Hama
n
o
Merge b
r
anch 'jd/fix-strbuf-add
-
urlenco
d
e
-
byt
e
s'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Mer
g
e
branc
h
'ew/empty-merge-with
-
dir
t
y-
i
ndex'
commit
|
commitdiff
|
tree
2018-01-05
Jun
i
o C Ham
a
no
Me
r
ge branch
'db/
d
oc-
c
onfig-section-names-with-bs'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Haman
o
Mer
g
e branch 'jk/
t
est-suite-tra
c
in
g
'
commit
|
commitdiff
|
tree
2018-01-05
Johannes Schindelin
rebas
e
-
p
: fix quoting when calling `
g
it merge`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-04
Jeff King
docs/diff-options: clarify
s
cop
e
of d
i
ff-filter types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-04
T
o
dd Zullinger
http: fix v1 protoco
l
test
s
wi
t
h
apa
c
he ht
t
pd < 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
Johannes
S
c
h
i
n
d
elin
t0302 & t3900:
a
dd forgott
e
n quo
t
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
Johan
n
es
S
chindelin
Allow t
h
e test suite
t
o pass in
a direc
t
ory whose name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
Ævar Arnfj
ö
rð Bjarmason
b
i
s
ect: fix a regress
i
on cau
s
ing a segfault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
To
d
d Z
u
llinger
doc/Sub
m
i
t
tingPatch
e
s
: im
p
rove te
x
t formatting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
SZEDER Gábor
travis-ci: check that all build artifacts a
r
e
.
gi
t
ign
o
re-d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-03
SZEDER Gábor
t
r
avis-
c
i
:
don't store P4 and
G
it LFS
i
n the working
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-02
SZEDER Gáb
o
r
trav
i
s
-
ci: record and skip successfully b
u
ilt tr
e
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-02
SZEDER Gábor
t
ra
v
is-ci: create t
h
e
cache dir
e
ctory early in t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-01-02
S
Z
EDER Gábor
t
ravis-ci: print t
h
e "tip of branch is ex
a
ctly at ta
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-28
Ju
n
i
o
C
H
amano
Git 2
.
16-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-28
Ju
n
io C
Haman
o
M
erge
bran
c
h 'sb
/
de
s
cribe-blob
'
commit
|
commitdiff
|
tree
2017-12-28
Ju
n
io
C
Hama
n
o
Merge
b
ranch 'hi
/
m
er
g
e-verify-sig-config'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Haman
o
Merge branch 'ws/curl-http-prox
y
-over-https'
commit
|
commitdiff
|
tree
2017-12-28
J
u
nio C Hamano
Merge b
r
anch '
k
s/
d
oc
-
pre
v
ious-c
h
eckou
t
'
commit
|
commitdiff
|
tree
2017-12-28
Junio C
Hamano
Mer
g
e b
r
anch
'
ks/rebase-er
r
or-messages'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
M
erg
e
branch 'sr/ht
t
p-sslver
i
f
y-config-doc'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Mer
g
e br
a
nch
'nm/im
a
p-send-quote-server-folde
r
-na
m
e'
commit
|
commitdiff
|
tree
2017-12-28
Jun
i
o C Hamano
M
erge branch 'bp/fsmonitor'
commit
|
commitdiff
|
tree
2017-12-28
Junio C H
a
mano
Merge branch 'jh
/
par
t
ia
l
-clon
e
-doc'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hama
n
o
Merge
b
ran
c
h 'jt/t
r
a
n
s
port-hide-vtable'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hama
n
o
Merge branc
h
'js/enhanced-version
-
info'
commit
|
commitdiff
|
tree
2017-12-28
Junio C
H
amano
M
e
rge branch 'tz
/
l
i
b
-gi
t
-svn-svnserve-tes
t
s
'
commit
|
commitdiff
|
tree
2017-12-28
Junio
C Hamano
M
erg
e
branch 'ew/svn-crlf
'
commit
|
commitdiff
|
tree
next