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 'la/quiltimport-keep-non-patch'
2018-12-09
Elijah Newren
g
i
t-rebase
.
txt: update n
o
te
abo
u
t
d
i
rectory r
e
na
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah New
r
en
fast-ex
p
ort: add a --s
h
o
w-o
r
i
g
inal-ids option to s
h
ow
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Newren
fast-
i
mport: r
e
mov
e
unmaintai
n
ed duplicat
e
documentatio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
re
n
fast-exp
o
rt: add --referenc
e
-
e
x
c
luded-p
a
re
n
t
s
option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
fast-e
x
port: ensure we export request
e
d
refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newr
e
n
fast-expor
t
:
w
h
e
n usin
g
paths, avoid corrupt str
e
am
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
f
ast
-
expor
t
: move com
m
it r
e
w
riting logic
into a function
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export:
a
void dying when filtering by paths and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah
N
ewren
f
ast-
e
xpor
t
: u
s
e value from correct enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
git-
f
ast-e
x
port
.
t
x
t: clarify misleading d
o
cume
n
tation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Newr
e
n
git-fast-import
.
tx
t
:
fix documenta
t
ion fo
r
--quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export:
c
onvert sha1 to o
i
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h Newren
t6
0
36
,
t6043:
i
ncr
e
ase code coverag
e
for file coll
i
sion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
mer
g
e-re
c
urs
i
ve: improve
r
ename/ren
a
me(1to2)/a
d
d[/a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elija
h
Newren
m
e
r
g
e-recursive: use hand
l
e_fil
e
_col
l
ision for add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah Newren
merge-recursive: im
p
rove
h
a
n
dling for ren
a
me/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merg
e
-recursive: fix renam
e
/
add conflict hand
l
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newr
e
n
m
e
r
ge-re
c
ursive: n
e
w function for better colliding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ij
a
h N
e
wren
merge-re
c
ursive: increase marker lengt
h
with depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elija
h
N
e
wr
e
n
t6036, t6042: testc
a
ses
for r
e
name co
l
lision of already
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t604
2
: add tests f
o
r consi
s
tenc
y
in f
i
le coll
i
sion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elijah
Newren
fsck: move
fsck_
h
ead_link()
to get_de
f
a
u
l
t
_heads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
E
l
i
j
ah Newren
mer
g
e
-
recursive: avoi
d
showing
conflicts with
m
erge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
E
l
ij
a
h Newren
merge-recursive: improv
e
a
u
t
o-me
r
ging messag
e
s with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
commit:
f
ix erroneous BUG, 'multiple renames on
t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-recursive: rename merge_file_1() an
d
merge_content()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Ne
w
ren
merge-rec
u
rsive: remove fi
n
al remaining caller o
f
merge_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
El
i
jah Newren
mer
g
e-recursive
:
avoi
d
w
r
apper function when unnecessary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-recu
r
sive: set paths correc
t
ly
when
three-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
E
l
ij
a
h Newren
sequen
c
er
:
fi
x
--allow-em
p
ty-message behavior, m
a
ke
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elij
a
h Ne
w
ren
update-ref: allow --no-deref with --stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elija
h
Newren
u
pdat
e
-re
f
: fix type of up
d
ate_fl
a
gs variable to match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
El
i
j
a
h
N
e
wren
r
erere: avoid buff
e
r
overrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
E
l
ijah Newren
t
4
2
0
0: d
e
m
o
nstrat
e
rerere segfault on spec
i
ally
c
raf
t
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah
N
ew
r
e
n
Rem
o
ve superfluou
s
t
railing se
m
ico
l
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
am
:
a
v
oid direc
t
ory rename det
e
ction when calling recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newr
e
n
m
e
r
ge-recurs
i
ve
:
a
d
d ability to
t
urn off directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah New
r
e
n
t3401: add anoth
e
r directory rename testcase
for rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
ah Newre
n
R
e
move
forward declaration of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newre
n
c
o
mpat/precompo
s
e_
u
tf8
.
h
: u
s
e m
o
re c
o
mmo
n
include
g
uar
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
urlmatch
.
h
:
fix i
n
clude
g
uard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
M
o
v
e
definition o
f
enum branch_tra
c
k from
c
a
c
he
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah New
r
en
alloc:
m
ak
e
allo
c
a
te_alloc_s
t
ate and
c
lear_a
l
loc_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah Newren
Add missing i
n
c
ludes and forw
a
rd declar
a
tions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
g
it-update-index
.
t
xt: reword possibly confu
s
ing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah New
r
en
t740
6
: avoid u
s
ing te
s
t_must_fail
for comma
n
ds ot
h
er
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t
7406: prefer
test_*
h
elper
func
t
ions t
o
test -[f
e
ds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
lij
a
h
N
ewren
t
7
40
6
: av
o
id having git comma
n
ds up
s
trea
m
of
a
p
i
p
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
jah Newren
t74
0
6: simplify by u
s
ing diff
--name-only
i
nstead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah Newren
t7406:
fix
c
a
l
l
that was failin
g
for the wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah
N
e
w
r
en
t303
1
: update test
d
escription t
o
mention desired beh
a
v
ior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
read-cache: fi
x
d
i
rectory/file c
o
nflict handli
n
g in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
t1
0
15: demonst
r
ate directory/file c
o
nflict recov
e
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
E
lijah Newren
merge-recu
r
sive: preserve s
k
ip_w
o
rktree bit whe
n
ne
c
ess
a
ry
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
t7405:
verify 'merge -
-
abort' works aft
e
r sub
m
odule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Newren
t
74
0
5: add a
directory/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newre
n
t7405: add a file/submo
d
ule conf
l
ict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newr
e
n
m
erge: fix
m
is
l
ead
i
ng pre-merge check docu
m
entation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
re
n
me
r
ge-recursive: en
f
or
c
e rule that index matches
he
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
ren
t6044: ad
d
more testcases with staged change
s
before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wren
mer
g
e
-
recursive: fix as
s
umpti
o
n tha
t
head
tree be
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah
New
r
en
m
erge-
r
ecursive:
make sure when we say we
a
bort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
i
j
ah Newren
t
6044: add a testcase for index matching
head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah New
r
en
t6036:
a
dd a failed
c
onflict detection ca
s
e: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Newre
n
t60
3
6:
add lot
s
of d
e
t
ail for dir
e
c
t
ory/file c
o
nflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
t6042:
a
d
d
testcase covering
l
o
ng c
h
ains of re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: a
d
d testcas
e
covering renam
e
/
rename
(
2
t
o1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
t6042: a
d
d
t
estcase covering ren
a
me/add/delete conf
l
ict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Newr
e
n
t6036: add a
failed conflict detection case with conflict
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a f
a
i
led conf
l
ict detection case with
s
u
bm
o
d
u
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6
036: add
a
f
ail
e
d
c
o
nf
l
ict detection case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
en
t6036: add
a
failed
c
on
f
lict detect
i
on case with s
y
m
l
ink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a f
a
i
l
ed c
o
nflict detec
t
io
n
c
a
se with
sy
m
link
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t60
4
4: ve
r
if
y
that merges ex
p
ected t
o
abort actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
in
d
ex_has_chan
g
es(): avoid ass
u
mi
n
g
o
p
erating
on the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
read
-
cache
.
c:
mo
v
e in
d
ex_h
a
s_ch
a
nges() from m
e
rge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah N
e
w
r
en
t5407: f
i
x
t
est to cover intended ar
g
uments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elija
h
N
ewren
ap
p
l
y
: fix grammar error in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ij
a
h
N
ewre
n
git-rebase--merge: modernize "git-$
c
m
d
" to
"
g
i
t $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ew
r
en
F
ix use
o
f strategy
opti
o
ns with
i
nte
r
ac
t
ive rebase
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah
N
ewr
e
n
t
3
4
18:
a
d
d testcase
s
ho
w
ing problems wit
h
rebas
e
-
i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
a
h
Newren
git-re
b
a
s
e: make
--allow-empty-message t
h
e defa
u
lt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
t3401:
add dir
e
ctor
y
r
ename
testc
a
s
e
s for rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
git-
r
ebase
.
t
x
t: document beh
a
vioral d
i
fferen
c
es between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
jah Newren
direc
t
o
ry-rename-detection
.
txt:
t
echnical docs o
n
abi
l
ities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newre
n
gi
t
-
r
ebase
.
t
x
t: a
d
dr
e
ss
c
onfusion between
-
-no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
git-
r
ebase:
e
r
ror out when incomp
a
tible o
p
ti
o
ns passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
j
ah Ne
w
ren
t3422: new testc
a
ses for checkin
g
when incompa
t
i
b
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
E
l
ijah Newren
git-rebase
.
sh:
update
he
l
p messages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-
r
e
base
.
txt:
document
incompat
i
ble opti
o
ns
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newren
RelNotes 2
.
18: clarif
y
where
d
irector
y
re
n
ame detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
ah
Newren
merge-recursive:
a
d
d pointer abo
u
t u
n
du
l
y complex l
o
oking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
i
ja
h
Newre
n
merge-recursive: rename c
o
nfli
c
t
_
renam
e
_*()
f
a
mily
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah
Newren
merge-recursive: clarify the re
n
ame_dir/RE
N
AM
E
_DI
R
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
ah New
r
en
merge-recur
s
ive
:
ali
g
n labels with
their
r
espective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newren
merge
-
recursive
:
fix
n
u
m
erous a
r
g
ument alignm
e
nt
i
s
s
ues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
ah Ne
w
r
en
merge-recursive: fix
m
iscellaneous grammar error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah
N
ew
r
e
n
RelNo
t
e
s
:
re
m
ove dup
l
icate re
l
ease note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6
0
3
6
: p
r
efer test_when_finis
h
ed to ma
n
ual cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6
0
36, t6042
:
prefer
test_c
m
p to sequences
o
f test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next