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
merge-recursi
v
e:
u
s
e x
s
trdup() instead of
fixed buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merg
e
-recursive: ensure
we
w
rite u
p
dates
f
or d
i
rect
o
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah New
r
en
merge-
r
ecursive: avoid spurious rename/rename co
n
flict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
director
y
renam
e
detection: n
e
w testcases sh
o
wcasing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah Newren
merge
-
recursive: fix remaining direct
o
ry
r
e
name
+ d
i
rty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah
N
ewren
merge-recu
r
s
ive:
f
ix o
v
erwriting dirty files involved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive:
a
vo
i
d clobbering untracked f
i
les with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah Newre
n
merge-rec
u
rsi
v
e: apply n
e
c
essary modificat
i
ons for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
a
h Newren
merge-recursive: when comparing files, don't include
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive
:
chec
k
for f
i
l
e
level con
f
lict
s
the
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
m
e
rge-recursive: a
d
d
co
m
putatio
n
of colli
s
ions
due
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
mer
g
e-recu
r
si
v
e:
c
h
e
c
k f
o
r directory l
e
vel conflic
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
e
wren
merge-recursi
v
e: add get_director
y
_renames()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
mer
g
e-
r
ecursive: make a
h
elper function
f
or cleanup
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
merge-recursive: s
p
lit out c
o
de for
determining
d
iff_filepai
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-recursiv
e
: make !o->d
e
te
c
t_rename codepath more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Ne
w
r
en
merge-recursi
v
e:
f
ix leaks of allocated re
n
ames and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
e
wren
merge-
r
ecu
r
sive: introduce new fun
c
tions to
handle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: move
the
g
et_renam
e
s
(
) fun
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
directory renam
e
dete
c
tion:
tests for han
d
ling
o
verwriting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
directory rename detection: tests for han
d
ling overwriting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h New
r
en
d
irectory re
n
a
me detection: miscella
n
eo
u
s
t
estcases
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename
d
e
te
c
tion
:
testcases exploring possibl
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
a
h Newren
d
i
rectory rename detection: more involved
e
d
g
e/c
o
r
n
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
di
r
ectory
rename
detection: t
e
stc
a
s
e
s checking whi
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory
rename detection: files/
d
irector
i
e
s
in t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
di
r
ectory rename d
e
t
e
ct
i
on: pa
r
tially renamed
d
irector
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
irectory
r
ename det
e
ction: testcases to
a
v
o
id taking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detect
i
on: directory
splitting testcases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
dir
e
ctory
re
n
ame de
t
e
c
tio
n
: basic testcases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-19
E
l
ija
h
N
e
wren
me
r
ge-recursive: add expl
a
natio
n
for src_entry and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newr
e
n
m
erge-recur
s
ive: fi
x
lo
g
ic
o
rde
r
in
g
i
s
sue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
Tighten and correct a few testcas
e
s
f
or m
e
r
g
ing
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-17
J
u
n
io C
H
ama
n
o
Git
2
.
1
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-16
Juni
o
C Hamano
Mer
g
e tag 'l10n-2
.
1
6
.
0-rnd2' of git://githu
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-01-12
SZEDER Gábor
R
e
l
N
o
tes
:
mino
r
typo
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-11
Junio C Hama
n
o
Git 2
.
16-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-11
J
unio C Ham
a
no
Merge
b
ranch 'jh/object-f
i
lteri
n
g'
commit
|
commitdiff
|
tree
2018-01-11
Junio C
H
ama
n
o
Merge branc
h
'tg/worktree-create-tracking'
commit
|
commitdiff
|
tree
2018-01-11
Junio
C
H
amano
Merge b
r
anch 'j
s
/test-with-ws-in-
p
ath'
commit
|
commitdiff
|
tree
2018-01-11
R
a
lf Thiel
o
w
Do
c
umentatio
n
/git-w
o
rktree
.
txt: add missing
`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-10
B
eat Bolli
t3900: add some mor
e
q
uotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-10
Junio C Hamano
RelNotes update
before -
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-10
J
u
nio C H
a
mano
Mer
g
e branch
'
js/p
e
r
l-pat
h
-wor
k
around-in-tes
t
s
'
commit
|
commitdiff
|
tree
2018-01-10
Junio C Hamano
M
e
r
ge
b
ranc
h
'ew/empty-mer
g
e-with-dirty-index'
commit
|
commitdiff
|
tree
2018-01-10
J
u
nio C Hama
n
o
Merge branch
'
ma/bisect-leakfix'
commit
|
commitdiff
|
tree
2018-01-10
Junio C Hamano
M
erge
b
ranch 'js/fix-
m
erge-arg-quoting-in-reb
a
se-p'
commit
|
commitdiff
|
tree
2018-01-10
Johanne
s
S
ch
i
n
d
e
lin
mingw: hand
l
e G
I
TP
E
RLLIB in t
0
0
21 in a Wi
n
dows-compatibl
e
way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Ju
n
i
o
C Ha
m
ano
Me
r
g
e
b
ranc
h
'
j
k
/
d
oc-diff-options'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge branch
'bw/prot
o
col-v1'
commit
|
commitdiff
|
tree
2018-01-09
J
u
ni
o
C Ham
a
no
Me
r
ge branch 'sg/
t
ravi
s
-check-untr
a
cked
'
commit
|
commitdiff
|
tree
2018-01-09
J
unio C Hamano
Merg
e
branch 'js/test-with-ws-in-path'
commit
|
commitdiff
|
tree
2018-01-09
Junio C
H
amano
Merge bra
n
ch 'b
c
/sub
m
itting
-
p
at
c
hes-i
n
-asc
i
ido
c
'
commit
|
commitdiff
|
tree
2018-01-09
Junio C H
a
m
a
no
Mer
g
e branch 'sg/t
r
a
v
is-
s
kip-identical-tes
t
'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge bra
n
ch 'ab/
d
c-s
h
a1-loose-e
n
ds'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Haman
o
Merge br
a
nch 'sg/tr
a
vis-fi
x
es
'
commit
|
commitdiff
|
tree
2018-01-09
Ju
n
io C Hamano
Merge bra
n
c
h 'js/mi
s
c-git-gui-stuff' of
.
.
/git-gu
i
commit
|
commitdiff
|
tree
2018-01-09
Johannes
S
chindelin
git-gui: allow Ctr
l
+
T
to toggle
m
ultipl
e
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Johannes Schindelin
git-gui: fix exc
e
ption when
t
r
y
ing t
o
stage w
i
th
empty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Johannes Schindel
i
n
git-gui: avoid exc
e
pt
i
on upon Ctrl
+
T
in a
n
e
mpty li
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
J
o
ha
n
nes Sc
h
indelin
git gui
:
fix sta
g
ing a second line
t
o a 1-
l
i
ne fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Junio C Ham
a
no
Merge
b
ranch 'ew/empty-m
e
rge-with-
d
ir
t
y-index-maint
.
.
.
commit
|
commitdiff
|
tree
2018-01-09
Jun
i
o
C
Hamano
merge-re
c
u
r
s
i
ve: d
o
not l
o
ok a
t
the ind
e
x during
r
ecurs
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-08
Thomas Gummerer
oidset
:
d
o
n't re
t
urn value from oids
e
t_
i
nit
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
Junio C
H
am
a
no
Merge branch
'js
/
sequencer-cleanups'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Merge
branch 'jh/memihas
h
-opt'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Merge branch 'tb/te
s
t-lint-wc-
l
'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Ha
m
ano
M
e
rge branch 'rs/use-argv-array-in-child-p
r
oces
s
'
commit
|
commitdiff
|
tree
2018-01-05
Junio C
H
amano
M
erge bra
n
ch 'ld/p4-multiple
-
s
h
elves'
commit
|
commitdiff
|
tree
2018-01-05
J
u
nio C Hamano
Merge bran
c
h
'j
d
/fix-strbuf-add-urlencode-byt
e
s'
commit
|
commitdiff
|
tree
2018-01-05
Junio
C Hamano
M
e
rg
e
branch 'ew/
e
mpty-mer
g
e-with-dirty-index'
commit
|
commitdiff
|
tree
2018-01-05
J
u
nio C Hamano
Merge branch
'db/doc-con
f
i
g-s
e
cti
o
n-names-with-bs'
commit
|
commitdiff
|
tree
2018-01-05
Ju
n
io C H
a
mano
Merge
b
r
anch 'jk/test-suite-tra
c
in
g
'
commit
|
commitdiff
|
tree
2018-01-05
Johannes S
c
hindelin
rebase -p: fix qu
o
t
ing when ca
l
ling `g
i
t
m
e
r
g
e`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-04
Jeff King
docs/dif
f
-options: clarify scope of dif
f
-filter
type
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-04
Tod
d
Zul
l
in
g
er
h
t
t
p: fix v1 protocol tests
w
i
th apache httpd < 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
Johannes Schindelin
t
0
302 & t3900: add forgot
t
en qu
o
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
Joha
n
ne
s
S
c
hind
e
lin
Allow the t
e
s
t
suite to pass
i
n a d
i
rect
o
ry
whose name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
Ævar Arn
f
jörð
B
jarma
s
on
bisect:
f
ix a regr
e
ssion ca
u
s
i
ng a segfa
u
lt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
To
d
d Zullin
g
er
doc/Submitti
n
gP
a
tch
e
s: improv
e
t
ext
f
ormat
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
SZEDER Gábor
travis-ci
:
check that al
l
build artifa
c
t
s ar
e
.
gi
t
ignor
e
-d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
SZEDER G
á
bor
tra
v
is-
c
i: d
o
n't store P4 and Git
L
FS in
t
he working
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-02
SZEDER
G
ábor
travis-ci: record and skip succ
e
s
s
fully built trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-02
SZE
D
ER Gábor
tra
v
is-ci: create t
h
e cache directory early in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-02
SZEDER G
á
bor
tra
v
is-ci: print the "tip of
b
r
anch
i
s exactly
a
t
tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Git 2
.
16-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-28
Juni
o
C Hamano
Merg
e
b
ranch 's
b
/des
c
rib
e
-
blob'
commit
|
commitdiff
|
tree
2017-12-28
Jun
i
o
C
Hamano
Merge br
a
nch 'hi/merge
-
verify-
s
i
g
-
c
onfig
'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merg
e
br
a
nch 'ws/c
u
rl
-
http-proxy-over-https'
commit
|
commitdiff
|
tree
2017-12-28
Ju
n
io C Hamano
Merge branch '
k
s
/doc-p
r
evious-checkout'
commit
|
commitdiff
|
tree
2017-12-28
J
u
n
i
o C Ha
m
an
o
Merge br
a
nch 'ks/re
b
a
se-error-messages'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge branch 'sr/http-sslverify-co
n
fig-doc'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Haman
o
Merge branch 'nm/imap-send-quote
-
serve
r
-
folder-name
'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge branch
'
bp/
f
smon
i
tor'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge
b
ranch 'jh/partial-clone-do
c
'
commit
|
commitdiff
|
tree
2017-12-28
Junio
C
Hamano
Merge
b
ran
c
h
'jt/transport-hide-vta
b
le'
commit
|
commitdiff
|
tree
2017-12-28
J
u
nio C Ha
m
ano
Merge
bra
n
ch '
j
s/enhanced-
v
ers
i
on
-
info'
commit
|
commitdiff
|
tree
2017-12-28
Junio
C
Haman
o
M
e
rge branch 'tz/lib
-
git-svn-
s
vnserve
-
tests'
commit
|
commitdiff
|
tree
2017-12-28
Junio
C
Hama
n
o
Mer
g
e
branch
'ew/svn-cr
l
f'
commit
|
commitdiff
|
tree
next