repo.or.cz
/
wiggle
/
upstream.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Allow a word to have an unmatched prefix and suffix.
2013-03-01
NeilBrown
Allow
a
word
t
o h
a
ve an unma
t
ched p
r
efix an
d
suffix
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-03-01
NeilBrown
discar
d
ends_mline, just use ends_line
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-03-01
NeilBrown
vpatch: r
e
str
u
c
t
ure draw_
m
side
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-03-01
Ne
i
l
B
r
own
Re
m
ove dupl
i
c
a
te defi
n
itio
n
of "csl_join"
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-03-01
Nei
l
Brown
merge: R
e
move noise
f
rom --show-wiggles ou
t
put
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-20
NeilB
r
own
vpa
t
ch: fix bro
w
s
e
o
f three
-
file merge
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-19
NeilBro
w
n
tests:
add 'merge' test for l
i
nux
/
raid5
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-14
N
eilBrown
Add valgri
n
d
tes
t
i
n
g o
f
p
a
rts of vpatch
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-14
Neil
B
rown
Add "make
v
a
l
grind
"
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-14
NeilBrown
merge:
r
e
m
ov
e
some m
e
aningless AlreadyApplie
d
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-14
N
e
ilBrown
best
m
a
t
ch: improve poor
m
at
c
hes
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-13
N
e
i
lBrown
merge:
r
e
mo
v
e useless conte
x
t
from the end of a conflict
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-13
Nei
l
Brown
merge: remove us
e
les
s
c
ontex
t
at the sta
r
t of
a
conflict
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-13
NeilB
r
o
wn
v
patch: fix
anoth
e
r access-be
y
ond-array
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-12
N
eilBro
w
n
vpatch: allow relevan
t
signals to
c
aus
e
a co
r
e-dump
.
commit
|
commitdiff
|
tree
2013-02-12
Nei
l
Brown
vpatch: fix various reference
error
s
f
o
und by valg
r
ind
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-07
NeilBrow
n
Browser: add missing documen
t
ation for Save and
Restore
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-06
NeilBro
w
n
d
if
f
: make r
e
d
i
ffing of patche
s
more
pre
c
ise
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-04
NeilBrown
DOC: remove
diff
.
ps
due to dist
r
ibu
t
ion lic
e
n
se
i
ssues
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
NeilBr
o
wn
v
p
atch: ad
d
mouse movement to
m
erge_window
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrow
n
vpatch: add mouse s
u
pp
o
rt
for main wi
n
dow
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
N
eilBrown
Man page updates
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrown
vp
a
t
c
h: allow co
n
trol
-
C to disab
l
e --re
p
lace function
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrow
n
v
p
atch: handle --
r
epl
a
c
e o
p
tion
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrown
v
p
atch: add X
command to ignore all c
h
ange
s
in
the
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
Ne
i
lBrown
vpatch: make sure render
is
s
table when the mer
g
e
is
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
Nei
l
Brow
n
vpatch: allow ch
a
n
g
es to be ignored as well as conflict
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
Nei
l
Brown
vpatch: fix disp
l
a
y
f
o
r ignored
c
onflicts
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrown
vpatch:
a
dd "c
o
ntr
o
l
-X-O" as a watch
t
o chan
g
e
panes
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilB
r
own
vpatch: allow mode setti
n
g
keys to toggle b
a
c
k
to
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrow
n
v
p
atch
:
ch
a
nge appearance of ig
n
o
r
e
d con
f
licts
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatch:
update status counters
w
hen w
e
s
ave a file
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatch:
a
dd
'
C' command t
o
go t
o
n
e
x
t conflicted hunk
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBro
w
n
v
patch: highlight conflicts better
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
v
p
a
tch: update displ
a
y co
r
rectl
y
w
h
en editing t
h
e
m
e
r
g
e
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatch:
c
onditionally auto-save uns
a
ved
f
iles whe
n
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatch: av
o
i
d repeat
e
d backups
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBro
w
n
vpa
t
ch:
prompt
to save change if m
e
rge
was
e
ditted
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
Ne
i
lBrown
vp
a
t
c
h: al
l
o
w
a save
file
to be re
s
tored
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatch: support
s
aving of files
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpat
c
h:
Allow
a message
t
o be displayed
i
n ma
i
n fo
l
d
e
r
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBr
o
wn
S
e
para
t
e m
a
ke_merger out fro
m
print_merge2
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatch: remov
e
lots of memory leaks
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
N
e
i
lBrown
v
p
atch: a
l
low a fil
e
in lis
t
to b
e
a 'merg
e
r'
instead
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
NeilB
r
o
wn
vpatch: allow c
o
nflict to be igno
r
ed
with 'x
'
commit
|
commitdiff
|
tree
2012-11-13
NeilBrown
vpatc
h
:
chan
g
e args to
visible()
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
NeilBrown
vpatch: avoid extra
blanks wh
e
n cur
s
or is in alternate
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
N
e
ilBr
o
wn
vpatch: add 's
p
a
c
e'
and 'ba
c
kspace' for page
u
p/down
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
Neil
B
rown
vpatch: highligh
t
s
p
aces when they m
i
g
h
t b
e
i
m
p
o
r
t
ant
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
NeilBrown
v
p
atch: make
ctrl-G
s
earch-aga
i
n-forward, n
o
t just
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
NeilBrow
n
vpatch: fix check_line to s
t
op
at hunk
head
e
rs
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-12
NeilBrow
n
vpatch: ensure sea
r
chi
n
g
for 'next
cha
n
ge'
w
o
rks
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-12
Ne
i
lBrown
v
p
atc
h
:
re
v
ise
t
he exact
meaning o
f
'CHANGES'
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-12
Neil
B
rown
vpatc
h
: rem
o
ve CH
A
NGED
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-11
NeilBrown
Brows
e
:
ens
u
re we era
s
e all
of old type name w
h
en
upd
a
ting
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-11
NeilBrown
Browse: git problem in rendering file l
i
s
t
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-10-08
Manpreet Singh
FreeB
S
D/*BSD build fi
x
es for wiggle attac
h
ed and a bug
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-06-26
Chris
P
ete
r
son
Fix some new
co
m
piler warnings
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-05-17
NeilBrown
vpatch
- use 'cols' in main window
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-05-17
NeilB
r
own
config
.
h: includ
e
different endia
n
f
i
l
e for OS/X
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-05-17
N
e
ilB
r
own
extr
a
ct: remove
d
unused variable: line
n
o
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-05-15
Ne
i
lBrown
merge: make
s
o
m
e conflicts
l
e
ss
c
onflicting
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-05-15
Ne
i
lBrown
Browser
:
fix i
n
_conflict detection while browsing
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree