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
argv-array: return the pushed string from argv_push*()
2018-05-22
J
unio
C
H
amano
a
rgv-ar
r
ay:
ret
u
r
n
the
pushed string from argv_pu
s
h*(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-20
El
i
jah New
r
en
merge-recursive:
pr
o
vide
pair of
`
unpack_trees_{start
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-20
Martin Å
g
r
e
n
merge: setup `opts` l
a
t
e
r in `checko
u
t
_
fast_
f
orward()`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Ben Peart
m
e
rge: pass
ag
g
ressive w
h
en rename dete
c
tio
n
i
s
t
u
rned off
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Ben
Peart
m
e
rge:
add
me
r
g
e
.
renam
e
s
config sett
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Ben
Peart
me
r
g
e: update
documentation for
{merge,diff
}
.
r
e
nameLimit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-recurs
i
ve: fix
c
he
c
k
f
or
skip
a
b
i
l
i
t
y of workin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: make
"Auto-me
r
g
i
ng" commen
t
sh
o
w for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
ew
r
e
n
merge-
r
ecursive: fix
r
em
a
inder of was
_
di
r
ty() to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursiv
e
: fi
x
was_tracked() to q
u
it lying with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t6046: testca
s
es c
h
ecki
n
g
whether updates
can
be skipp
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah
Newren
me
r
g
e
-recursive: avoid
t
r
igg
e
ring a
d
d_cacheinfo error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
w
ren
merge-recursive: mov
e
more
i
s
_dirty
h
an
d
ling to merge_content
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merg
e
-recu
r
sive:
improve ad
d
_cacheinfo error handl
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursi
v
e: avoid spurious re
n
ame
/
rename conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Ne
w
ren
di
r
ec
t
or
y
rename detecti
o
n: new
t
e
stcases sho
w
casing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
merge-re
c
ursive: fix remaining directory rename + dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rge-rec
u
rsive: fix overwriti
n
g dirty fil
e
s
i
n
v
ol
v
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ew
r
en
mer
g
e-recur
s
ive: avoid clobb
e
ring untrack
e
d file
s
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursive: a
p
ply neces
s
ar
y
modif
i
cations for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-
r
ecursive: when comparing files
,
don't include
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
e
wren
merge-recu
r
sive: check for fi
l
e level con
f
l
i
c
ts th
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
recursive: a
d
d com
p
u
t
a
tion of
collisions due
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-re
c
ursi
v
e
:
c
h
eck for direct
o
ry
l
evel conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah N
e
wren
m
e
r
ge-
r
ecursiv
e
: add get_directory_rena
m
es()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: mak
e
a helper functio
n
for
c
leanup
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
Newren
merge-r
e
c
u
r
sive: spl
i
t out cod
e
for determin
i
ng
d
iff
_
f
ilepairs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-
r
ecursive: make !o->dete
c
t_
r
ename c
o
d
e
path
more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ij
a
h N
e
wren
merge-recur
s
ive: fix
l
eaks
o
f allocated
r
en
a
mes and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
m
e
rg
e
-rec
u
rsive: introduce new functions to handle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge
-
recursive: mov
e
th
e
g
e
t
_
renames
(
) function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newre
n
directo
r
y
r
e
name detect
i
o
n
:
tests for han
d
ling ove
r
writ
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory ren
a
me detection: tests for ha
n
dl
i
ng overw
r
iting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
di
r
ectory rename detection
:
miscellan
e
o
us testcases
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
dire
c
tory rename
d
etec
t
io
n
:
t
estcases explor
i
ng possibly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
directory rename de
t
e
ction: mo
r
e i
n
volved
ed
g
e/corner
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detection: t
e
s
t
cases checki
n
g
which
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
e
w
ren
di
r
e
c
tory
r
ename detect
i
on
:
fil
e
s
/
dire
c
tories in th
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
r
e
cto
r
y rename detecti
o
n: partially r
e
n
amed dir
e
c
t
ory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ij
a
h Newren
d
i
rec
t
ory rename
detection: testca
s
es to avoid taking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory renam
e
detection: d
i
re
c
t
o
ry spli
t
ting testcas
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
w
r
en
directory re
n
a
m
e detection: basic testcases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Jun
i
o C Hamano
M
e
rge branch 'svn/au
t
hor
s
-
p
r
og-2' of git://bogomips
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Reve
r
t "Merge branch 'en/rename-direc
t
ory-
d
etection'"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C Hamano
T
h
e third bat
c
h for
2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
J
unio C Hamano
Merge branch 'eb/
c
red-helper-ignore-sigpi
p
e'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
H
amano
M
erge branch 'lv/tls-1
.
3'
commit
|
commitdiff
|
tree
2018-04-11
Junio C H
a
mano
M
erge branch 'p
k
/
test-avoid
-
pipe-hiding-exit-status'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C Hamano
Merge bra
n
ch
'
rs/
s
t
atus
-
w
ith-removed-s
u
b
m
odule'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch 'nd/combined-test-help
e
r'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
M
erge bra
n
c
h
'sb/packfiles
-
in-repository'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C H
a
mano
Merge bra
n
ch 'sb/ob
j
ect-sto
r
e'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch 'jc/test-must-be-empty'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch 'cc/perf-aggregate-sort'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
M
e
rge branch 'ab/doc-hash-brokenness'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch 'bc/hash-independen
t
-te
s
ts'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C
Hamano
M
e
r
ge branc
h
'ab/drop-contrib-e
x
amples'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hama
n
o
T
he second batch for
2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge branch 'ys/bis
e
ct
-
object-id-mis
s
ing-conversion
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge branch '
y
k/fi
l
t
e
r-branch
-
non-committish-refs'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ha
m
ano
M
e
r
g
e branc
h
'nd/tra
c
e-with-env
'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
M
e
rge branch 'nd/parse
o
p
t
-c
o
mpletion-more'
commit
|
commitdiff
|
tree
2018-04-10
Junio C H
a
m
a
no
Merge branch 'ds/bs
e
a
r
ch-hash'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
M
e
rge b
r
anc
h
'ws/reba
s
e-p'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Merge branch 'jk/diff-hig
h
li
g
ht-grap
h
-fix'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Ha
m
ano
M
erge branch
'
n
d
/remov
e
-ignore-env-field'
commit
|
commitdiff
|
tree
2018-04-10
J
unio C Hamano
Mer
g
e
b
ranch 'ps/con
t
ains-id-error-message'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
The first
batch for 2
.
18 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
M
erge branch 'tg/st
a
sh-untrack
e
d-with-pathspec-fix'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Haman
o
Merge
b
ranch 'nd/wo
r
ktree-prune'
commit
|
commitdiff
|
tree
2018-04-09
J
unio
C Hamano
Merge branch '
b
c/ob
j
ect-id
'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge branch 'm
a
/shortlog-revparse'
commit
|
commitdiff
|
tree
2018-04-09
Juni
o
C
H
amano
Me
r
ge
b
r
a
nch '
a
b/i
n
s
t
all-syml
i
nks'
commit
|
commitdiff
|
tree
2018-04-09
Junio C H
a
ma
n
o
Merge branch 'm
l
/filter-br
a
n
ch-no
-
op-error'
commit
|
commitdiff
|
tree
2018-04-09
Junio
C
Haman
o
Merg
e
branch 'ab
/
pc
r
e
-
v2'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
Hamano
Merge
b
ranch
'
ti/fetch-ev
e
r
y
thing-local-o
p
tim'
commit
|
commitdiff
|
tree
2018-04-09
J
u
ni
o
C
Hamano
Merge b
r
anc
h
'
e
n
/
r
e
nam
e
-directory-detection'
commit
|
commitdiff
|
tree
2018-04-02
Ju
n
io C H
a
ma
n
o
Git
2
.
17
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-02
Junio
C Hamano
Merge ta
g
'l10n-2
.
17
.
0
-
rnd1' of git
:
//github
.
com/
g
it
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
Junio C
Hamano
Merg
e
branc
h
'pw/add-p-single'
commit
|
commitdiff
|
tree
2018-04-01
Æ
var Arnfjörð B
j
a
rm
a
son
add
-p: fix 2
.
17
.
0-r
c
*
r
egre
s
sion due to moved co
d
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Junio C H
a
mano
Merge branch 'jh/partia
l
-clon
e
'
commit
|
commitdiff
|
tree
2018-03-29
J
o
nathan Nieder
upload
-
pack: dis
a
ble object filtering when disabled
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Erik E Bra
d
y
credenti
a
l: ign
o
re SIGPIPE whe
n
wr
i
ting to
c
re
d
ential
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Loga
n
aden Velv
i
ndron
h
t
tp: al
l
ow use of
T
LS 1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
René S
c
harfe
sub
m
odule: che
c
k
f
o
r
N
U
LL ret
u
rn of get_sub
m
odule_
r
ef_stor
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Junio C Hamano
G
i
t 2
.
17-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
J
uni
o
C Ha
m
ano
Merge branch 'tg
/
stash-doc
-
typofix'
commit
|
commitdiff
|
tree
2018-03-28
J
unio C Ha
m
ano
Merge branch
'pc/submodu
l
e-helper'
commit
|
commitdiff
|
tree
2018-03-28
J
u
nio
C
Hamano
Merge branch 'nd/pars
e
opt
-
compl
e
t
i
on'
commit
|
commitdiff
|
tree
2018-03-28
Pratik Kark
i
test:
a
void
pipes
in git related comm
a
nds for test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Stef
a
n Beller
s
u
b
module de
i
n
i
t
: handl
e
non existing pathspecs gra
c
efu
l
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Thoma
s
Gummerer
git-stash
.
t
x
t: remove extra squa
r
e
bracket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Ævar
Arnfjörð B
j
arm
a
s
o
n
doc h
a
s
h
-
function-tr
a
nsition: clar
i
fy wh
a
t SHAttered
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arnfjörð Bjar
m
ason
d
o
c
hash-funct
i
o
n
-
t
ransitio
n
: clarify ho
w
olde
r
gits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
SZEDER Gábor
test_must_be_e
m
pt
y
: simplify file existenc
e
check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Christi
a
n Coude
r
p
erf/aggr
e
ga
t
e:
add
-
-sor
t
-by=
r
egr
e
ssion o
p
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Christian Couder
p
erf/aggregate: add disp
l
ay_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thá
i
Ngọc Du
y
t/helper:
merge te
s
t-
w
r
i
te-ca
c
h
e in
t
o test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái
N
gọc Duy
t/helper
:
me
r
ge test-wildmatch into test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next