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
Disable *all* backups when --no-backups used
2013-03-01
NeilBrown
A
l
l
ow
a
word to have an unmatched prefix and suffix
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-03-01
NeilBrown
di
s
card en
d
s_
m
lin
e
, j
u
st use ends_line
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-03-01
N
e
ilBrown
vpatch
:
re
s
t
r
u
c
ture
draw_mside
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-03-01
NeilBrown
Rem
o
ve duplicate definition of "csl_join"
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-03-01
NeilBrown
merge
:
R
emove noise from --show-wi
g
gles o
u
tput
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-20
N
eilBrown
vpatch: fix browse of
t
hree-file me
r
ge
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-19
Neil
B
rown
tes
t
s
:
add 'merge'
t
est fo
r
l
inux/raid5
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-14
Ne
i
lB
r
own
Add valgrind
testi
n
g of parts of vpatch
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-14
NeilBrown
Add "make va
l
g
r
i
nd"
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-14
NeilBrown
m
e
rge: r
e
m
o
ve some meaningless AlreadyApp
l
i
e
d
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-14
NeilBrown
bestmatch: improve poor mat
c
h
e
s
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-13
Ne
i
lBrown
merge: remove us
e
less context f
r
om
t
he end of a
c
onfli
c
t
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-13
NeilBrown
merge
:
remo
v
e
us
e
less context at the
start of a conflict
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-13
NeilBro
w
n
vpatch: f
i
x another access-be
y
ond-arra
y
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-12
Ne
i
lBrown
v
pat
c
h: all
o
w relevant signals
t
o
c
ause a core-du
m
p
.
commit
|
commitdiff
|
tree
2013-02-12
NeilBrown
vpatch:
fix vari
o
us reference errors
fo
u
nd
by
valgrind
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-07
NeilBrown
Bro
w
ser: a
d
d missing
d
oc
u
mentation for Sav
e
a
n
d Rest
o
re
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-06
NeilB
r
o
w
n
diff:
make rediffing
o
f patche
s
more p
r
ecise
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2013-02-04
Ne
i
l
B
ro
w
n
DO
C
:
remove dif
f
.
p
s
d
u
e
t
o
distributio
n
license
i
ssues
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrown
vpat
c
h: add
m
ouse movement to merge_window
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
NeilB
r
own
v
patch:
add mou
s
e support for main
win
d
ow
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
N
eilBrown
Man page update
s
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrown
v
p
a
tch
:
allow control-C to disabl
e
-
-
replace function
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrown
vpatch: handle --
r
e
p
lace option
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
Ne
i
l
Brown
vpatch:
a
d
d
X comma
n
d to i
g
nore all cha
n
ges
in the
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrown
vpatch: make
s
ure render is
stable
w
hen the mer
g
e is
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrown
vpatch: allow chang
e
s to be ignored as well as conflict
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
Neil
B
rown
vpatch: fix disp
l
a
y
for ignored
c
o
nflicts
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-15
Ne
i
lB
r
own
vpatch: add "control-X-O" as a w
a
tch to change panes
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatch:
a
l
low mo
d
e se
t
ting keys to togg
l
e back t
o
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
N
eilBro
w
n
v
patc
h
:
c
h
ang
e
appearance of ignored conflicts
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrow
n
vpatch: update sta
t
u
s
counters when we save a fil
e
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBr
o
w
n
vpatch:
add 'C' command
t
o go to
next conflicte
d
hunk
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatch: hig
h
l
ight conflict
s
be
t
ter
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
Neil
B
r
o
w
n
vpatch: updat
e
dis
p
lay correctly when editing the
merge
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
N
e
i
lBrown
vp
a
tc
h
: conditio
n
a
lly a
u
to-sa
v
e unsaved files w
h
e
n
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatc
h
: avoid repe
a
te
d
backups
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
Nei
l
Brown
vpatch: prompt to save change if me
r
ge was edi
t
t
e
d
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
Ne
i
l
B
rown
vpat
c
h: allow a save fi
l
e
to be
r
estored
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
Nei
l
Brown
vpatc
h
: support saving of files
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatch: Allow a message to be displ
a
yed i
n
main
f
older
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
Separ
a
te m
a
ke_merger out from prin
t
_mer
g
e2
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-14
Neil
B
ro
w
n
vpatch: rem
o
v
e lot
s
o
f
m
emory
leaks
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
NeilBrown
vpa
t
ch: allow a file in list to be a 'me
r
ge
r
' instead
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
Nei
l
Brown
vpatch: allow c
o
n
f
lict to
be ignore
d
with 'x'
commit
|
commitdiff
|
tree
2012-11-13
NeilBrow
n
v
p
a
tc
h
:
chang
e
args
t
o visible()
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
N
eilBrown
vpatch: avoid extr
a
blanks whe
n
c
u
rsor is
i
n
alternat
e
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
NeilBr
o
w
n
v
p
atch: add 'space' and 'backspace' for page u
p
/down
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
NeilB
r
own
vpa
t
ch: highlight spaces when they might be important
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
NeilBr
o
wn
vpa
t
ch: make ctrl-G search-again-forward, not just
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-13
Ne
i
lBrown
vpatch:
f
ix check
_
line to stop a
t
hunk
head
e
rs
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-12
N
e
ilBrown
vpatch: ensu
r
e searching for 'nex
t
c
hange' works
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-12
NeilBrown
v
p
atch: rev
i
se the
exa
c
t meani
n
g of 'CHANGES'
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-12
Ne
i
lBrown
vpat
c
h: remove CHA
N
GED
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-11
NeilBrow
n
B
r
owse: ensu
r
e w
e
era
s
e all
of old type name when up
d
ating
.
.
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-11-11
NeilBrown
B
r
owse:
git prob
l
em
i
n rende
r
ing fi
l
e
list
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-05-17
N
e
ilBro
w
n
vpatch - use 'cols' i
n
main window
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-05-17
NeilBrown
confi
g
.
h
:
include
diff
e
rent endian fi
l
e for OS/X
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-05-17
NeilBro
w
n
extra
c
t: remov
e
d unused variable
:
lineno
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-05-15
NeilBrown
merge: make some conf
l
i
c
ts le
s
s conflicting
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree
2012-05-15
NeilBrown
Browser: fix in_conflict
d
etec
t
io
n
while brows
i
ng
.
Signed-off-by:
NeilBrown
<neilb@suse.de>
commit
|
commitdiff
|
tree