repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sg/clone-initial-fetch-configuration'
2018-11-17
El
i
jah New
r
en
fast-ex
p
ort: add a --show-original-ids op
t
io
n
to s
h
ow
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-i
m
p
o
r
t: remo
v
e unmaintained duplica
t
e documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
f
ast-
e
xport:
a
dd --refer
e
nce-excluded-parents
op
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
jah Newren
fas
t
-export: ensure we export requested r
e
fs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fas
t
-export
:
when
u
s
i
ng
p
aths, avoid corrupt stream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-expor
t
:
move commit
rewriting logic i
n
t
o
a function
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
fast-e
x
p
o
r
t: av
o
id dying wh
e
n
filte
r
i
n
g by paths and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast
-
expo
r
t: use value
f
r
om correct enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah N
e
wren
git-fas
t
-
e
x
port
.
txt:
clarify mi
s
leading documentation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
ren
git-fast-impor
t
.
txt: fix doc
u
m
entati
o
n for --quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newr
e
n
f
a
s
t-export: convert sha1 to oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah N
e
wren
t6036,
t604
3
:
increase code
cover
a
g
e for
f
ile collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
m
erge-r
e
cursive: im
p
r
o
ve rename/rename(1to2)/ad
d
[/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah Newre
n
merge-r
e
cursi
v
e: use handle_file_collisi
o
n for
a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
Newren
mer
g
e-recursive:
i
m
prove handl
i
ng for
r
ename/re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newre
n
merge-recursive: fix rena
m
e/
a
dd con
f
lict handli
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elija
h
Newren
merge-
r
ecu
r
sive:
n
ew f
u
ncti
o
n for b
e
tter c
o
lliding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah N
e
wre
n
me
r
ge-recursiv
e
: increas
e
m
a
rk
e
r length with depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elija
h
Newren
t6036, t6042: t
e
s
t
cases for
r
ename col
l
ision
o
f already
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
ah N
e
wren
t
60
4
2: add tests
for consistency in
f
ile c
o
lli
s
io
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elijah Newren
fsck: move fsck_head_lin
k
(
)
t
o get_default_heads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
m
e
rge-recursiv
e
: avoi
d
showing conflicts with m
e
r
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
E
l
ijah Newren
merge-recursive: improve
a
uto
-
merging mes
s
ages with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
commit:
fix erroneous
BUG, 'multiple
renames on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elij
a
h
Newren
merge-recursive:
r
ename mer
g
e_file_1()
a
nd merge_
c
ontent()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Eli
j
ah Newr
e
n
merge-recu
r
sive: re
m
ov
e
final re
m
aining cal
l
e
r o
f
m
e
rge_f
i
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah
N
ewre
n
merge
-
recursive: avoid wrapper function w
h
en unnecessary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merg
e
-
r
e
cursiv
e
: set paths correctly when three-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
El
i
jah Newren
se
q
ue
n
cer: fix --a
l
low-emp
t
y-messa
g
e behav
i
o
r, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Eli
j
ah New
r
e
n
updat
e
-
ref: allow --no-dere
f
with --std
i
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
update-r
e
f: f
i
x type o
f
update_flags variable to match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah
Newren
rerere: avoid buf
f
er
o
v
errun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah New
r
en
t4200: demonstrate r
e
rere se
g
fault
o
n spe
c
ially crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah Newren
Remove superfluous trailing
s
emicolons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
lijah Newr
e
n
am: avo
i
d
di
r
ectory rename d
e
tection when
calling rec
u
rsive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elija
h
Newren
m
erge-recursiv
e
: add ability t
o
turn off directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah
N
ewre
n
t
3
401: add
a
n
other
d
irectory renam
e
te
s
tcase for reb
a
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah Newren
Remove
forward decl
a
ration of an
e
n
u
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
N
e
wren
compat/prec
o
mpose_utf
8
.
h: use more common in
c
lud
e
g
uard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lij
a
h N
e
wren
urlmatch
.
h: f
i
x in
c
lude guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah
Newren
Move definition of enum branch_track
f
rom c
a
c
h
e
.
h
to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah N
e
wren
alloc:
m
ake al
l
ocate_
a
lloc_state and cle
a
r
_al
l
oc_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ija
h
Newren
Add missing incl
u
des
a
nd forward
de
c
larations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elij
a
h Newren
git-upd
a
t
e
-
i
ndex
.
txt:
reword poss
i
bly co
n
fusing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elij
a
h Newren
t740
6
: avoid using
te
s
t_m
u
s
t_fail
for commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah N
e
w
r
en
t74
0
6:
prefer test_* hel
p
er functi
o
ns
t
o test -[f
e
d
s]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
ewren
t7406: avoid ha
v
ing g
i
t commands upstream of a
p
ipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: s
i
mplify by using di
f
f
-
-name-only i
n
st
e
a
d
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
lijah Newren
t
7
406
:
fix call th
a
t was fail
i
ng for th
e
wrong rea
s
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
El
i
jah Newr
e
n
t3031: update test description
to mentio
n
desired behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
read-cache: fix
d
ire
c
tory/file conflict handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
t1015: dem
o
nstrate directory
/
file conflict rec
o
ve
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah New
r
e
n
merge-recu
r
sive
:
preserve skip_worktree
bit when
necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h New
r
en
t7405: verify 'merg
e
--abort' w
o
rks
after submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newren
t
7
405: add a
direc
t
ory/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
en
t7
4
05: add a file/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
m
e
r
g
e: f
i
x misleading pr
e
-merge check documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah New
r
e
n
m
e
rge-recursive: enforce
r
ule that i
n
d
e
x
ma
t
ches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044: add more
t
estcases with
staged changes before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
e
w
r
e
n
m
e
r
ge-rec
u
rsive: fix assumption th
a
t
h
ead tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recursive: make sure
w
hen w
e
say
we ab
o
rt that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t604
4
: add
a
t
estcas
e
for
index matchi
n
g head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
ren
t60
3
6: ad
d
a failed c
o
n
f
lict detection
c
a
s
e
: r
e
g
u
lar
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Newren
t6
0
36:
add lots o
f
d
etail for
d
irectory/file confli
c
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
j
ah Newren
t6042: a
d
d test
c
ase coverin
g
l
o
n
g
chains of rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newr
e
n
t6042: add test
c
ase
c
o
veri
n
g re
n
a
me/r
e
n
ame
(
2to1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah
Newren
t60
4
2
:
add testcase
c
o
v
e
ring r
e
name/add/de
l
ete co
n
flict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Ne
w
ren
t6036: add a failed conf
l
i
c
t detection
c
ase with conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
a
h Newren
t6036: add a
f
ailed co
n
flict dete
c
tion case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
t6
0
36: add
a
f
a
i
l
e
d conf
l
i
c
t
detection case with submo
d
ule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Ne
w
ren
t6036:
add a fai
l
ed conflict dete
c
tio
n
case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036:
add a
f
ailed conflict d
e
t
e
ct
i
on cas
e
wit
h
syml
i
nk
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
604
4
: verif
y
t
h
a
t
merges ex
p
ec
t
ed to
a
bort actua
l
ly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
jah Newren
i
ndex_has_change
s
()
:
avoid assuming
o
peratin
g
on the
_
index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
rea
d
-cache
.
c: m
o
ve
i
nde
x
_has_
c
hanges() from merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Eli
j
ah Newren
t5
4
07
:
fix te
s
t t
o
cover
i
ntended argume
n
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
apply:
fix gra
m
mar err
o
r in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah
N
e
wren
git-rebase--merge: modernize "gi
t
-$
c
md" to "git
$
c
m
d
"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
Fix use of strate
g
y opt
i
ons with interactiv
e
reba
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newre
n
t3418: add t
e
s
t
c
a
se showing p
r
obl
e
m
s w
i
th
rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Ne
w
r
e
n
git-rebase: make --allo
w
-empty-message the defau
l
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newre
n
t3401: add
direc
t
o
r
y rename te
s
t
c
ases
f
or rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
Newren
git-rebase
.
tx
t
:
d
ocument behavior
a
l
d
i
f
f
erences between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah
N
ewren
d
i
rectory-rename-detect
i
on
.
txt:
technical
d
ocs
o
n
a
bilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
ren
git-rebas
e
.
txt: addre
s
s
c
o
n
fusion between --no-ff
v
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
git-rebase: e
r
ror out wh
e
n incompati
b
le option
s
passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
t3422
:
new testca
s
es
for
c
hecking when incompatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
E
l
ijah N
e
wren
git-rebase
.
sh: up
d
ate help me
s
s
a
ges a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-r
e
base
.
txt: document incompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Ne
w
ren
RelNotes 2
.
18:
clarify wh
e
r
e
direct
o
ry rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
i
j
ah
N
e
wren
merge-re
c
ur
s
ive: add
pointer abou
t
un
d
uly
c
o
m
plex looking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Newren
merge-recursive
:
ren
a
me co
n
f
l
ict_rename_*() family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah N
e
wre
n
me
r
ge-rec
u
rsive: clari
f
y the rename_dir/RENAME
_
DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
i
j
ah Newren
merge-recursive: align
l
a
b
els with
their respective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
m
er
g
e-recursive: fix n
u
merous argument alignment issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah
N
ewren
mer
g
e-recursive: fix misc
e
llaneous gram
m
ar
error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
RelNotes: remove duplica
t
e relea
s
e note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Eli
j
ah
N
ewr
e
n
t6036: prefer test
_
whe
n
_finished
to manual
c
lea
n
up
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah N
e
wre
n
t6036, t6042: pre
f
e
r
test
_
cmp to sequences of te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Ne
w
ren
t6036, t6042
:
prefe
r
test_p
a
th_
i
s_file
,
te
s
t
_
path_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next