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
t6036: avoid non-portable "cp -a"
2018-12-01
Carlo
Marcelo Arenas
.
.
.
t6036: avoid non-porta
b
le "cp -a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-11-08
Derrick Stolee
merge-recursive: combine error h
a
ndling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t60
3
6, t6043: increase code coverag
e
for file collisio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah Newren
mer
g
e-recurs
i
ve: improve renam
e
/rename(1to2)/add[/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
ah N
e
wren
merge-recursive: u
s
e
h
andle_file_colli
s
ion for add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h
N
e
wren
merge-recursive
:
improve handling
for
r
ename/renam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah N
e
wren
merge
-
r
e
cursive: fix rename/add conflict h
a
ndling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah New
r
en
merge-rec
u
rsive: new funct
i
on for better co
l
l
iding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
ah Newren
m
erge-recursive: increase marker length with depth
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah Ne
w
ren
t6036, t
6
0
42:
testca
s
es
f
o
r
rename co
l
li
s
i
o
n of already
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
ewren
t6
0
4
2
:
a
dd tests f
o
r consi
s
tency in file collision
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-18
E
l
i
ja
h
Newr
e
n
merg
e
-
r
ecu
r
sive: avoid sh
o
wing confli
c
ts with merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
merge-rec
u
rsive: improve auto
-
merging
m
ess
a
ges with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-20
Eli
j
a
h
Newren
merge-recursive: rename merge_file_1() a
n
d m
e
rge_content()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah
New
r
en
m
e
r
g
e
-recursive: remov
e
f
i
nal rema
i
ning ca
l
l
e
r of
m
erge_file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-20
E
l
ijah Newren
merge-recursiv
e
: avoid w
r
apper
f
u
nction
w
hen unn
e
cessary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-20
Elija
h
Newren
merge
-
recurs
i
v
e: se
t
pat
h
s correc
t
ly when thr
e
e-w
a
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-17
Jun
i
o C Hamano
Initial batch post 2
.
19
commit
|
commitdiff
|
tree
2018-09-17
J
unio C
H
am
a
no
M
erge branch
'nd/bi
s
ect-show-list-fix'
commit
|
commitdiff
|
tree
2018-09-17
Ju
n
io
C Hamano
Merg
e
branch 'ab/fetch-tags
-
noclobber'
commit
|
commitdiff
|
tree
2018-09-17
Junio C Hamano
Me
r
ge branch 'es
/
w
orktree-f
o
rced-op
s
-fix'
commit
|
commitdiff
|
tree
2018-09-17
Junio C Hamano
M
erge bran
c
h 'sg/doc-trace-ap
p
ends'
commit
|
commitdiff
|
tree
2018-09-17
J
u
nio C Hamano
Merge
bra
n
ch 'jk/dif
f
-rendered-docs'
commit
|
commitdiff
|
tree
2018-09-17
Jun
i
o C Hamano
Merg
e
branch 'jk/patc
h
-co
r
ru
p
ted
-
d
elta-fix'
commit
|
commitdiff
|
tree
2018-09-17
Junio
C
Hamano
Merge bra
n
ch
'
ds/c
o
mmit-graph-tests'
commit
|
commitdiff
|
tree
2018-09-17
J
u
n
i
o C Hama
n
o
Mer
g
e br
a
n
c
h 'jk/pack-objec
t
s-w
i
th-bitmap-fix'
commit
|
commitdiff
|
tree
2018-09-17
Junio C Ham
a
no
Merge bra
n
ch '
r
s/mai
l
info-fo
r
m
at-flowed'
commit
|
commitdiff
|
tree
2018-09-17
Junio
C
Hama
n
o
Merge branch 'jk/cocci
'
commit
|
commitdiff
|
tree
2018-09-17
Jun
i
o
C Ha
m
a
no
Me
r
ge branch
'
tg/rerere-doc-updates'
commit
|
commitdiff
|
tree
2018-09-17
Jun
i
o
C Hamano
Merge branch
'e
s
/f
o
rmat-patc
h
-
r
anged
i
f
f
'
commit
|
commitdiff
|
tree
2018-09-17
Junio C Hamano
Merge
b
ranch 'es
/
forma
t
-pat
c
h-int
e
rdiff'
commit
|
commitdiff
|
tree
2018-09-17
Jun
i
o C Haman
o
M
erge branch 'cc/delta-islands'
commit
|
commitdiff
|
tree
2018-09-17
Junio C
H
a
m
a
no
Merg
e
bran
c
h 'jk/trailer-
f
ixes
'
commit
|
commitdiff
|
tree
2018-09-17
Junio C Hamano
M
erge branch 'sb/range-diff-colo
r
s'
commit
|
commitdiff
|
tree
2018-09-17
J
u
nio C
H
amano
Merge branch 'jk/pack-delta-re
u
s
e
-wi
t
h
-
b
i
tmap'
commit
|
commitdiff
|
tree
2018-09-17
Junio C H
a
mano
Me
r
ge
b
ranch 'nd/unpack-trees
-
with-cache-tree'
commit
|
commitdiff
|
tree
2018-09-17
Junio
C Hamano
Merge b
r
anc
h
'ds/rea
c
hab
l
e'
commit
|
commitdiff
|
tree
2018-09-17
Junio
C
Hamano
Merge branch 'sb/submodule-up
d
ate-in-c'
commit
|
commitdiff
|
tree
2018-09-17
Junio C Hamano
M
erge branch 'tg/r
e
r
ere'
commit
|
commitdiff
|
tree
2018-09-17
Junio C Hamano
Merge branch 'd
s
/
multi-pack-index'
commit
|
commitdiff
|
tree
2018-09-17
J
u
n
i
o C Hamano
M
erge
b
r
a
nc
h
'jk/
b
ranch-l-1-repurpose'
commit
|
commitdiff
|
tree
2018-09-17
Junio C Hamano
Merge branch 'tg/conflict-marker-size'
commit
|
commitdiff
|
tree
2018-09-17
Junio C Hamano
Merge bran
c
h '
t
s/doc-build-manpage
-
xsl-quietly'
commit
|
commitdiff
|
tree
2018-09-17
Junio C Hamano
Mer
g
e branch 'jk/rev-l
i
st-stdin-no
o
p
-
is-ok'
commit
|
commitdiff
|
tree
2018-09-17
Junio C Hamano
Merge b
r
anch 'b
p
/
c
heckout-new-branc
h
-opt
i
m'
commit
|
commitdiff
|
tree
2018-09-17
Junio
C Hamano
Merge bra
n
ch
'
sg/t1404-upd
a
te-ref-te
s
t-tim
e
out'
commit
|
commitdiff
|
tree
2018-09-17
Junio C Hamano
Merge branch 'nd/clone-ca
s
e-smas
h
in
g
-w
a
rning'
commit
|
commitdiff
|
tree
2018-09-17
Jun
i
o
C Hamano
M
erge branch 'mk/http-backen
d
-content-length'
commit
|
commitdiff
|
tree
2018-09-17
Junio
C
Hama
n
o
Revert "d
o
c
/
Make
f
il
e
:
drop doc-dif
f
worktree
a
nd t
e
mporary
.
.
.
commit
|
commitdiff
|
tree
2018-09-11
Max Kiri
l
lov
http-backend test: mak
e
empty CONTENT_LENGTH test
mo
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-10
Junio C Hamano
Git 2
.
1
9
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-10
Juni
o
C
Hamano
Merg
e
tag 'l10n-2
.
19
.
0-rnd
2
' of
g
it:
/
/github
.
com/
g
i
t
.
.
.
commit
|
commitdiff
|
tree
2018-09-10
Junio C Hamano
Merge branch '
j
n/su
b
m
od
u
le-
c
or
e
-wor
k
tree-r
e
vert'
commit
|
commitdiff
|
tree
2018-09-10
J
unio C Hamano
Merge
b
ranch
'mk/http-b
a
ckend-con
t
ent-length'
commit
|
commitdiff
|
tree
2018-09-08
Jo
n
athan
N
ieder
Revert "Merge branch 'sb/submodule-core-worktree'"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-07
Max Kirillov
http-backend: allow empty C
O
NTENT_LEN
G
TH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-05
Jef
f
King
d
oc-
d
i
ff: force
w
o
rk
t
ree add
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-04
Junio
C H
a
mano
Gi
t
2
.
19-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-04
J
u
nio C
H
amano
Merge bran
c
h 'es/chain-lint-more'
commit
|
commitdiff
|
tree
2018-09-04
Junio C Haman
o
M
e
rge branch 'ab/portable-m
o
r
e
'
commit
|
commitdiff
|
tree
2018-09-04
Jun
i
o C
Hamano
M
e
rge
branch 'es/
f
reebsd-
i
conv-p
o
rtab
i
li
t
y
'
commit
|
commitdiff
|
tree
2018-09-04
Junio C
H
aman
o
Merge b
r
anch 'ds/commit-gra
p
h
-
lockfile-fi
x
'
commit
|
commitdiff
|
tree
2018-09-04
Jun
i
o
C Hamano
Merge branch 'en/d
i
rectory-ren
a
mes-
n
othanks'
commit
|
commitdiff
|
tree
2018-09-04
Junio C Hamano
Merge branch 'pw/reba
s
e-i-au
t
hor-scr
i
pt-fix'
commit
|
commitdiff
|
tree
2018-09-04
S
Z
EDER G
á
bor
Docu
m
entation/gi
t
.
tx
t
: clarify
t
hat GIT_TRAC
E
=/path
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-04
N
guyễn Thá
i
N
gọc Duy
bisect
.
c: make show_list(
)
build agai
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-04
Jeff King
pa
c
k-bitmap: drop
"
loaded" fla
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-04
J
eff
King
tr
a
verse_bitmap_commit
_
lis
t
(
)
:
don
'
t fre
e
res
u
lt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-04
Jeff K
i
ng
t5310:
t
est delta reus
e
with bi
t
map
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-09-04
J
e
f
f
K
ing
bitmap_ha
s
_sha1_in_uninteresting(): dr
o
p BUG check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Ævar Arnfjörð Bjarmaso
n
f
e
t
ch: s
t
op
clobberin
g
ex
i
s
t
ing tags with
o
ut --force
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Ævar Arnfjörð Bjarmason
fetch: d
o
cument l
o
c
a
l ref
u
pda
t
es wi
t
h/without --force
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Ævar Arnfjörð
B
j
armas
o
n
pus
h
doc: correct
l
i
es abou
t
how p
u
sh refspecs work
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Ævar Arnfjör
ð
Bj
a
rmason
pu
s
h doc: m
o
ve
m
ent
i
on of "tag <tag>" later
i
n the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Ævar Arnfjörð
B
jar
m
a
so
n
push doc: rem
o
ve confusing
m
ention of remote m
e
rger
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Ævar Arnfjörð Bjarmason
fetch te
s
ts
:
add
a
tes
t
for clob
b
e
r
i
ng
tag
b
eha
v
ior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Ævar
Arnfjörð Bjarma
s
o
n
push
t
e
s
ts
:
use space
s
in interpolate
d
string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Ævar Arnfjörð Bjarm
a
son
push tests: make use o
f
unuse
d
$1 in test description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Ævar Arnfjörð
Bjarmason
fet
c
h: change "branch" to "reference" in
-
-
force -h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Eri
c
Sunshi
n
e
config
.
mak
.
uname:
r
eso
l
ve
F
re
e
BSD iconv
-
related co
m
pilation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Er
i
c
S
unshine
doc/
M
a
k
efile: drop doc-
d
iff
w
o
r
ktree and temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Er
i
c Sunsh
i
ne
doc-d
i
ff: add --clea
n
mode to remove tempo
r
ary working
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-31
Eric S
u
n
shine
doc-diff:
fix non
-
po
r
table '
m
an' invocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
J
e
ff King
doc/git-b
r
anch: rem
o
ve o
b
solete
"-l"
r
efer
e
nces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Jeff King
t5303: use
p
rintf to generate delta bases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Derrick Stolee
com
m
it: do
n
't
u
s
e
generation numbers if not nee
d
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Jeff King
patch-del
t
a: h
a
ndle tru
n
cated
c
op
y
parameters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Jann H
o
rn
patch-delta: consistently repo
r
t corru
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Jann Horn
patch-delta: fix
o
ob read
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
J
eff
K
i
n
g
t530
3
: tes
t
some corr
u
pt deltas
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Jeff King
t
est-delta:
r
ead input int
o
a
heap
b
u
f
fer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Jeff King
doc-di
f
f: always u
s
e
oids in
s
i
d
e worktree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Eri
c
Sun
s
hi
n
e
worktree: delete
.
git/wor
k
t
r
ees if empty after 'remove'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Eri
c
S
u
nshine
w
ork
t
ree: te
a
ch 'remove' to override lock when --for
c
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Eric Sunshine
worktree:
t
eac
h
'mo
v
e' to override lock
when --f
o
rc
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Eric Sunshine
wor
k
tree: teach 'add' to
r
esp
e
ct
-
-force f
o
r
r
eg
i
stered
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
E
r
ic Sunshi
n
e
worktr
e
e: disallow
a
ddin
g
s
a
me path mult
i
pl
e
ti
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Eric Sunshine
workt
r
ee: prep
a
r
e
f
o
r
m
o
re
c
hecks of whether pat
h
ca
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Eric Sunshi
n
e
wor
k
tr
e
e: generalize delete_git_dir() to reduc
e
code
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-30
Eric
Sunshin
e
w
o
rk
t
re
e
: move delete_git_
d
i
r
(
) earl
i
er i
n
file for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next