repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
test: use test_must_be_empty F instead of test_cmp empty F
2019-11-02
E
lijah
N
e
w
re
n
Re
l
No
t
e
s
/2
.
24
.
0: fix self-contradictory n
o
te
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newren
RelNotes/2
.
2
4
.
0: typofix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
t604[236]:
d
o n
o
t run setup
i
n separate tests
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah N
e
wren
merge-recursive: fix merging a
s
ubdi
r
ector
y
i
n
to the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
m
erge
-
recu
r
s
i
ve:
cle
a
n up ge
t
_r
e
n
a
me
d
_
d
ir
_
portion()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elijah
N
e
wr
e
n
m
e
rge-recursive: f
i
x th
e
fix to t
h
e
diff3 common ancest
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah N
e
wren
f
ast-
e
xport:
h
a
n
dle
n
e
sted
tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Ne
w
ren
t9350: add tests for tags of things other than
a
commit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newr
e
n
fas
t
-e
x
port: allow user
to
r
equest tags be marked with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah Newren
fast-export: add support for --import-mark
s
-if-e
x
ists
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
Newren
f
a
s
t
-i
m
port
:
a
d
d support for new '
a
lias' command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
El
i
jah Newren
fast
-
import: allow t
a
gs
t
o be identified by m
a
rk l
a
bels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ijah New
r
en
fast-import: fix ha
n
dling of dele
t
e
d t
a
gs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
E
lijah Newre
n
m
erg
e
-recursive: fix the diff3 co
m
mon ancest
o
r label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
El
i
jah Newre
n
d
i
r
: s
p
ecia
l
case
check
f
or t
h
e possibility that pa
t
hspec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elijah New
r
en
fast-export: fix ex
p
o
r
ti
n
g a t
a
g and nothing else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
w
ren
clean: f
i
x theoretical
p
ath c
o
rruption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h Newren
clean: rewrap overl
y
long lin
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Newren
c
l
e
an:
a
v
o
id removing u
n
t
r
acked files i
n
a nested gi
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
r
e
n
clea
n
: d
i
sambiguate the definition
of -d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Newr
e
n
gi
t
-clean
.
tx
t
: d
o
not claim we will dele
t
e fil
e
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
ewren
dir: add commen
t
ary explaining match
_
path
s
pec_
i
tem
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah
N
ewren
dir
:
if o
u
r pa
t
hs
p
e
c
m
i
ght matc
h
files u
n
der a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah New
r
en
dir: make the DO_MATCH_
S
UBM
O
DULE code reusable for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newren
dir: a
l
so chec
k
directories for matching pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: fix
o
ff-by-
o
ne
e
rror in
m
atch_paths
p
ec_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
dir
:
fix t
y
p
o
i
n comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
a
h
Ne
w
r
e
n
t7300:
a
dd testcas
e
s showing failure to
clean specified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
li
j
ah Newren
t99
0
2: use a n
o
n-deprecated command fo
r
testing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Eli
j
a
h
Newren
Recommend git-filter-repo i
n
stea
d
of git-
f
i
lter-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
lij
a
h Newren
t6006:
s
implify, fix, and optimi
z
e empty m
e
ssage test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t3427:
a
cc
e
lerate this
test by usi
n
g
fast-e
x
port and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
E
l
ija
h
N
ewren
merge-opti
o
ns
.
txt: c
l
arify meaning of various ff-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
mer
g
e-recursive
:
alp
h
abe
t
ize
i
nclu
d
e
list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recurs
i
ve: a
d
d
sani
t
y
che
c
k
s
f
or relevan
t
merge_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ija
h
Newr
e
n
merge-recursiv
e
: rename MERG
E
_
R
ECURS
I
VE_* to MERGE_V
A
RIANT_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
merge-recursive: split
inter
n
al
f
ields into a sep
a
r
a
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: avoid
l
osing out
p
u
t
and leaking memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
m
e
rge-rec
u
rsive: comm
e
nt an
d
r
e
o
rder the merge_options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
j
ah Newren
merge-recu
r
sive: consolidate unnecessary fie
l
ds in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah
N
e
w
r
en
m
er
g
e-recur
s
iv
e
: mov
e
some definitio
n
s arou
n
d
t
o clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: rename merge_options
a
rgument to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-re
c
ursiv
e
:
r
en
a
me 'mrtree' to '
r
esult_t
r
e
e
',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
m
e
rge-recurs
i
ve: u
s
e co
m
mo
n
name for ancestors/c
o
mmon
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Ne
w
r
e
n
m
erge-
r
ecursive: fix some overly long l
i
nes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
cache-t
r
ee: share code betwe
e
n functions writing an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: don't force exte
r
nal cal
l
e
rs to do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-recursive
:
rem
o
ve
u
seless
p
aramete
r
in merge_trees
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newr
e
n
merge-rec
u
rsive: ex
i
t ear
l
y if index !=
h
ea
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
En
s
ure index matches head before invokin
g
merge machine
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
m
e
r
ge-recu
r
s
iv
e
:
remov
e
anoth
e
r implic
i
t depend
e
ncy
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
jah N
e
wren
merg
e
-recursive:
future-p
r
o
of
u
p
d
ate_file_flags() again
s
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: provide a better labe
l
for d
i
ff3
c
omm
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ijah Newren
m
e
rge-recursive:
en
f
o
r
c
e opt->ancesto
r
!= NULL
w
hen
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
che
c
k
o
ut: pro
v
ide b
e
tte
r
conflict hunk description
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
El
i
jah Newren
merg
e
-rec
u
rsiv
e
:
b
e consistent with assert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
checkout: remov
e
duplicate co
d
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Elijah
N
e
wre
n
g
i
t-f
a
st-import
.
txt
:
clarify that mult
i
pl
e
me
r
ge
c
ommits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
Elijah Newren
merg
e
-re
c
ursive: avoid directory re
n
ame de
t
e
ction
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Elijah Newr
e
n
mer
g
e-rec
u
r
s
i
ve: restore
accidentally d
r
opped
s
ettin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Ne
w
ren
f
as
t
-export:
do automatic
r
e
encoding of com
m
i
t messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast
-
export:
diff
e
rentiate
between explicitly UTF-8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newre
n
fast-export: av
o
id stripping encoding header
if we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah New
r
en
fast-import: support 'encoding' co
m
mit head
e
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elij
a
h
N
ewren
t9350
:
fix encodi
n
g test t
o
ac
t
ually test
r
e
enc
o
ding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elijah
Newren
Honor core
.
precompo
s
e
U
n
ic
o
de in
more plac
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
m
erge-r
e
cu
r
sive: sw
i
tc
h
directory renam
e
detectio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
N
ewre
n
merge-
r
ecursiv
e
: gi
v
e
ca
l
lers
o
f
h
andle
_
content_m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
N
e
wre
n
merge-recu
r
sive: track informat
i
o
n
ass
o
ciated with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lij
a
h Newren
t604
3
: fix cop
i
ed test descript
i
o
n
to match its
p
u
rpos
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
a
h
Newren
mer
g
e-recu
r
sive: sw
i
t
ch f
r
om (oi
d
,mode) pairs to a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah
N
ew
r
en
merge-recurs
i
v
e
: cleanup han
d
le_rename_* fu
n
ction s
i
gnatures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
N
ewren
me
r
ge-recur
s
ive:
track
b
r
anch where rename occ
u
rred
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
Newren
merge-rec
u
rsive
:
remove ren[12]_other fields from r
e
name_con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah N
e
wren
merg
e
-recu
r
s
ive:
s
hri
n
k rename
_
conflict_
i
nfo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
i
j
ah Newr
e
n
me
r
ge-recurs
i
v
e: move some
st
r
u
c
t
d
eclarations together
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Ne
w
ren
merge
-
recursiv
e
:
use
'ci' for rename
_
confli
c
t
_
info
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
m
erge-recursive: rename loc
a
ls 'o' and 'a' to 'obuf
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
i
j
ah N
e
wren
merge-recur
s
ive
:
rename diff_filespe
c
'one' to 'o'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
N
ewren
merge-rec
u
rsive: re
n
ame merge_options argu
m
ent from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
Use
'
unsigned short
'
f
o
r mod
e
,
l
i
ke
diff_filespec does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
El
i
jah
N
ewren
f
ast-import:
fi
x
err
o
neous handling
of get-mark wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fast-
i
mp
o
rt
:
only allow cat-b
l
o
b
r
e
q
uests where i
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Eli
j
ah Newren
fast-import: che
c
k m
o
st prominent commands first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
l
ijah
Newren
g
i
t-fa
s
t-import
.
txt: fix wording a
b
out whe
r
e ls
command
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Eli
j
ah Newren
t9300: demonstrate bug with get-mark a
n
d
empty orphan
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elijah Newr
e
n
merge
-
options
.
txt: c
o
rrec
t
w
o
rding
of -
-
no-co
m
mit
o
ption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Eli
j
a
h
Newren
git-re
b
ase
.
txt: update to r
e
f
le
c
t merge now implemented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
Elija
h
Newre
n
log,diff
-
tree:
add
--combin
e
d-all-path
s
op
t
i
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
El
i
jah Newren
git-show-ref
.
txt: fix orde
r
of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
E
l
i
j
ah Newren
rebase: implement --
m
erge via
t
he interacti
v
e machinery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
El
i
jah Newren
rebas
e
:
define linearizatio
n
ordering and enforce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
git-le
g
acy-reb
a
s
e: simplify
u
nnecessary triply-nested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
git-rebase, sequencer
:
exte
n
d
--q
u
iet o
p
tion for
t
he
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h Ne
w
ren
am
,
rebase-
-
merge: do not overlook -
-
skip'ed commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
lijah Newren
t5407:
add
a test demonstrating how i
n
t
e
r
activ
e
handle
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
Newre
n
rebase: fix incompatib
l
e options
error messag
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
i
j
ah Ne
w
ren
reba
s
e: make
builtin and legacy script error
messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Eli
j
ah Newren
g
it-re
b
ase
.
txt: update note abou
t
di
r
ectory r
e
n
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newre
n
f
ast
-
export: add
a
--show-original-i
d
s
opti
o
n to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next