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
E
l
ijah Newren
fast-exp
o
rt: add a --show
-
original-ids
o
ptio
n
to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
f
ast
-
import: remove
u
nmaintained duplicate
doc
u
mentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Newren
fast-expor
t
: ad
d
--refere
n
ce-excluded-parents opt
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
ren
fast-ex
p
o
r
t: ensure we export requested refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
N
ewr
e
n
fast-export: when using paths, avoi
d
c
o
rrupt
stre
a
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newr
e
n
fast
-
export: m
o
v
e
commit rewriting l
o
gic in
t
o a function
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Newren
fast
-
expor
t
: avoid
dy
i
ng whe
n
filtering by p
a
ths and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah New
r
en
fast-expo
r
t: use v
a
l
ue from
c
o
rrec
t
enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
git-fast-export
.
txt: clarify m
i
s
lea
d
ing documen
t
ati
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
gi
t
-fa
s
t-impo
r
t
.
txt
:
fix documentatio
n
f
or --quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Newren
fast-expor
t
:
c
onvert sha1
t
o o
i
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Ne
w
r
e
n
t6036, t6043:
i
ncrease code coverage for file c
o
llisio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recurs
i
ve: improve rename/rename(1to2)/add[/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recu
r
sive
:
use
h
an
d
le_file_collision for add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
ah
N
ew
r
en
m
e
rge-
r
ecursiv
e
: improve handling for r
e
name/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h N
e
wren
merge-re
c
u
r
s
i
v
e
:
fix
r
ename/add conflict han
d
ling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recursive: new functi
o
n for b
e
t
ter colliding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Ne
w
ren
merge-
r
ecursive: in
c
rease marker leng
t
h with dep
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newren
t6036
,
t6042: tes
t
c
ases for rename collision of alread
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Ne
w
ren
t60
4
2
:
add tests for consisten
c
y in file
collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Eli
j
ah
N
ewren
fsck: move fsck_he
a
d_link()
t
o get_def
a
ult_heads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elija
h
N
e
wre
n
merge-recursive: av
o
id showing conflicts with m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
merge-recursive: improve auto-merging message
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
commit:
f
ix
erroneous
B
UG, 'multiple
r
enames on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah
N
e
w
r
e
n
merge-recursive:
r
ename merge_file_1()
a
nd merge_con
t
ent()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elij
a
h Newren
me
r
ge-recu
r
s
ive: remove final r
e
m
aini
n
g caller of merge
_
f
ile
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
m
erge-recursive: avoid wrapper function when unneces
s
ary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
m
erge-recursive:
s
et paths c
o
rr
e
ctly when
three-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
E
l
i
j
a
h
Newre
n
s
e
quenc
e
r: fix --allow-empty-messa
g
e
behavior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
El
i
jah
Newren
update-ref: allow --
n
o
-
der
e
f
with --stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah
N
ewren
update-ref: fix
type of update_flag
s
vari
a
ble to
match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
El
i
jah Newren
rerere: avoid
b
uffer o
v
errun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah
N
ewren
t4200:
demonstrate
r
erer
e
segfault on specially crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah Newren
Re
m
ove
superfl
u
ous trai
l
in
g
semico
l
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah
N
ewren
am: a
v
oid di
r
ectory rena
m
e detection when calling rec
u
rsive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah N
e
wr
e
n
mer
g
e-recursive: add a
b
ility to t
u
rn off dire
c
to
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
li
j
ah Newren
t3401:
a
d
d
another director
y
rename testcas
e
f
or
rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
N
ewren
Re
m
ove forward declarati
o
n of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
compat/precompo
s
e
_
u
t
f8
.
h: us
e
m
o
re
c
ommon
include
gu
a
rd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
urlmatch
.
h: fix include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Move definition of enum branch_track f
r
om
cach
e
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
ah
N
ewren
al
l
oc: make alloca
t
e_alloc_state and
c
lear_all
o
c_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Add miss
i
ng includes and
forward declarat
i
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elij
a
h Newren
git-u
p
date-index
.
txt: reword possibly confusing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: avoid using test_
m
u
st_
f
a
i
l
for comma
n
ds o
t
h
er
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah N
e
w
ren
t7406: prefer test_* h
e
lpe
r
functions
to test -[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
Newren
t74
0
6: avoid
having git co
m
mands upstream of
a pip
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t74
0
6
:
simplify
by using d
i
f
f
--name-only i
n
stead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: fix call that was failing for the wrong rea
s
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Newren
t3031: update
t
e
s
t
description
t
o me
n
t
i
on
d
e
s
ired behav
i
or
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
read-cac
h
e: fix directo
r
y/file conflict
handli
n
g in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elij
a
h Newren
t101
5
: demonstr
a
t
e
directory/
f
il
e
confli
c
t recovery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elij
a
h Newren
merge-recurs
i
v
e
: pr
e
serve sk
i
p_work
t
ree bit w
h
en necess
a
ry
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
a
h Newren
t7405: verify
'merge --abort
'
wor
k
s after submod
u
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
7
405: a
d
d a dir
e
ctory/submodule c
o
n
f
lic
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7
4
05: ad
d
a
file/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah Newren
merge: f
i
x misleadi
n
g
pre-m
e
rge
ch
e
ck documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
m
e
rg
e
-recursi
v
e: enf
o
rce rul
e
t
h
at index mat
c
hes head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044: add more testcases with sta
g
ed changes before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
me
r
ge-recursive: fix as
s
u
m
ption tha
t
head tree be
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
New
r
en
merge-re
c
ursive: m
a
ke
su
r
e
whe
n
we sa
y
we abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newre
n
t604
4
: add a testcase for index matching he
a
d, whe
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah
Newren
t60
3
6: a
d
d a failed conflic
t
detect
i
on case:
regul
a
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah
N
ewren
t6036: a
d
d
l
ots of
detail for directory/f
i
le conflict
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
t6042: add
testcase covering lo
n
g chains o
f
re
n
a
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042:
a
dd t
e
stcase c
o
v
e
ring renam
e
/rename(2t
o
1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6
0
42: add tes
t
cas
e
coveri
n
g rename/add/de
l
ete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
t6036: ad
d
a failed conf
l
ict detect
i
o
n
c
ase with conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6036:
add
a
failed confli
c
t de
t
ection case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add
a fail
e
d
conflict d
e
tection c
a
se with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
t6036: add
a failed c
o
n
flict detection case wit
h
symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
wren
t6036
:
add a fa
i
led conflict dete
c
tion case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6044: verify
t
ha
t
merges exp
e
cte
d
to abort
a
ctually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
index_has_chang
e
s(): avo
i
d assu
m
ing
o
perating on th
e
_
index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
read
-
c
a
che
.
c: mo
v
e index_has_chan
g
es() from merg
e
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
E
l
ijah Ne
w
ren
t5407:
f
ix test to cov
e
r intended
argum
e
nts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
El
i
j
a
h New
r
e
n
apply: fix gr
a
mm
a
r err
o
r i
n
co
m
men
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
jah New
r
e
n
git-rebase--merge: m
o
dernize "git-$cmd" to "g
i
t $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
Fix use of
s
trategy
o
ptions with in
t
eractive rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
j
a
h Newren
t3418: a
d
d te
s
tcase
showing pr
o
bl
e
ms with r
e
base -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-rebase: make --allow-empty-message the d
e
faul
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t3401: add
d
irectory rena
m
e te
s
t
c
ases for reba
s
e and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
ren
git
-
r
ebase
.
txt: docum
e
nt behavioral
d
i
ffe
r
ences between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newren
directory-rename-d
e
tect
i
on
.
tx
t
: technical do
c
s on abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-re
b
ase
.
txt:
address conf
u
sion between --no-
f
f vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
ren
g
i
t-rebase: e
r
ror out when i
n
compatible opti
o
ns passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newren
t3422:
new
testcas
e
s
for chec
k
ing when incom
p
atible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
El
i
jah
N
ewren
g
i
t-rebase
.
sh: update help m
e
ssages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
El
i
jah Newre
n
g
i
t-rebase
.
txt:
d
ocument
i
ncompatibl
e
options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newre
n
RelNotes 2
.
18: cla
r
ify where directory rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recursi
v
e: add pointe
r
about unduly complex looking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Newren
merge-recursive: rename conflict_rena
m
e_*
(
) famil
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
mer
g
e-recu
r
s
i
ve: clarify the r
e
n
a
me_dir/R
E
NAME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newre
n
m
erge-
r
ecursive: align labels with
t
heir respective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah N
e
wren
merge
-
recursive: f
i
x numer
o
us
argument alignmen
t
issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newren
m
e
r
ge-
r
e
cursive:
fi
x
miscel
l
a
n
eous grammar er
r
o
r in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
E
lijah Newr
e
n
RelNotes:
r
emove duplicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t
6
03
6
: prefer t
e
s
t_when_fini
s
hed to
m
an
u
al
clea
n
up
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t6042: p
r
e
fer test_c
m
p to sequences of tes
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
Newren
t6036, t6
0
42: pr
e
fer test_
p
ath_i
s
_file, test_path_i
s
_mis
s
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next