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
Browse: suppress "last-key" debugging.
2013-08-20
NeilBrown
Browse: su
p
p
r
e
ss "last-k
e
y
" debugging
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-08-20
NeilBr
o
wn
Bro
w
se: allow "--replace
"
to
b
e
r
equested while
v
iewing
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-08-20
NeilBrown
Browse
r
:
highligh
t
sp
a
ces a
t
the end of a line
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-08-19
Ne
i
lBro
w
n
A
dd s
o
me test
a
ft
e
r the m
a
rkers in
a m
e
rge
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-08-19
NeilBrown
me
r
g
e
:
f
i
x another bug
i
n i
s
ola
t
e_confli
c
ts
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-08-19
NeilB
r
own
vpatch: discard 'ignored' f
o
r
'oldtype'
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-08-19
NeilBrown
merge:
f
ix reporting
of em
p
ty "conflict
s
"
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-08-19
NeilBr
o
wn
tests: new test case
for stray &&&&&
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-08-19
Neil
B
rown
Browser
:
Don't
h
ighlight spaces so much
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-08-19
Nei
l
Brown
Unwrap som
e
p
rin
t
f
string
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-08-19
Nei
l
Brown
Br
o
wser help: add
some
m
issing
com
m
as
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-28
NeilBrown
Ext
r
act version in
f
ormation from 'gi
t
'
if
p
ossible
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-22
NeilBrown
merge: be mo
r
e
caref
u
l abo
u
t alig
n
ing
h
unk-
h
eaders
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-22
NeilBro
w
n
c
s
l
_jo
i
n
s
hould merge adjacent m
a
tch
e
s
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-08
Ne
i
lBrown
merge:
calculat
e
number of wiggles mo
r
e
accurately
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-08
NeilBrown
m
e
r
ge: tidy up isolation of
c
onflicts
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-08
Neil
B
rown
vpatch: restor
e
dis
p
lay fo
r
hunk h
e
ader where appropriate
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-05
Neil
B
r
o
wn
Add --ign
o
re-bl
a
nks option
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-01
NeilBrow
n
vpatch: allow a word
to hav
e
t
e
xt before the newli
n
e
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-01
NeilBrown
A
llow a word to h
a
ve an u
n
match
e
d prefix
and suffix
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-01
NeilBrown
discar
d
ends
_
mline, just us
e
ends_lin
e
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-01
NeilBrown
v
p
a
t
ch: restructure draw_mside
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-01
NeilB
r
own
Remov
e
duplic
a
te definition of "csl_join"
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-03-01
N
e
ilBrown
m
e
r
ge:
Remove noise from --show-wiggles o
u
tput
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-20
N
e
ilBrown
v
p
atch: fix
b
rowse of t
h
ree-fil
e
merg
e
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-19
NeilB
r
own
tests: add 'me
r
ge' test f
o
r
l
i
nu
x
/raid5
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-14
N
e
ilBro
w
n
Add val
g
rind testing of
parts of vp
a
t
c
h
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-14
Ne
i
l
Brown
Add "make valgrind"
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-14
Neil
B
rown
merge: remov
e
some
m
e
aningless AlreadyApplied
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-14
N
eil
B
r
o
wn
bes
t
match: impr
o
ve poor matches
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-13
NeilBrown
me
r
ge: remo
v
e us
e
le
s
s con
t
e
xt from
t
he end
o
f
a
c
onflict
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-13
Nei
l
Bro
w
n
merge: remove
us
e
less context at
t
he
start
o
f a conflic
t
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-13
Nei
l
Brown
vpatch: fix another acces
s
-beyond
-
array
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-12
NeilBrown
vpat
c
h: al
l
o
w relevant signals to
cause
a
co
r
e
-
dump
.
commit
|
commitdiff
|
tree
2013-02-12
Ne
i
lB
r
ow
n
v
p
atch: fix var
i
ous refe
r
e
nce errors found
b
y
val
g
rind
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-07
NeilB
r
own
B
ro
w
ser: add mis
s
i
n
g documentation fo
r
Save and
Restore
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-06
Nei
l
Brown
diff: ma
k
e
r
e
d
iffi
n
g of patch
e
s mor
e
p
r
ecise
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2013-02-04
NeilBrown
D
O
C: remove diff
.
ps
du
e
to
distribut
i
on licen
s
e issues
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-15
Ne
i
lBrow
n
vpatch: add m
o
use
m
ovement to mer
g
e_window
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrown
vpatch: add mouse supp
o
rt for main win
d
ow
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-15
Ne
i
lB
r
own
Man page updates
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-15
Neil
B
rown
vpa
t
ch
:
allow
co
n
tro
l
-
C
t
o disa
b
le --replace function
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrown
vpa
t
ch: han
d
le --repla
c
e opt
i
on
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrown
v
pat
c
h: add
X
command
to ign
o
re all
c
hanges in the
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-15
Ne
i
l
Brown
vpatch: make sure render is
s
table when the m
e
rge is
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-15
NeilB
r
ow
n
v
p
atch: a
l
low changes to be ignored
as well as c
o
n
fli
c
t
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-15
NeilBrown
vpatch
:
fix display for ignored confl
i
cts
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-15
N
e
ilBrown
vpatch: add "control-X-O" as
a watch t
o
change panes
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatch: allow mode settin
g
keys to togg
l
e back
to
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
Neil
B
r
o
w
n
vpatch: chan
g
e appearance of ignored con
f
l
i
cts
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
Ne
i
lBrown
vp
a
t
ch: upda
t
e
s
tat
u
s counters when we save
a file
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
N
eilBrown
vpat
c
h
: add 'C' command to go to
n
ext confli
c
te
d
hu
n
k
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrow
n
vpatch:
h
ighlight c
o
nfli
c
ts b
e
tter
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilB
r
own
vpat
c
h
:
upd
a
te
d
ispl
a
y correctly
w
he
n
ed
i
t
ing
t
he mer
g
e
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrow
n
v
p
a
tch: conditionally
aut
o
-save unsaved files when
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vp
a
tc
h
: avo
i
d
r
epeated
b
a
c
kups
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBr
o
w
n
vpa
t
ch:
prompt to s
a
ve chang
e
i
f
m
erge was editted
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vp
a
tch: allow a save file to be restored
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
Neil
B
rown
vpa
t
c
h: s
u
ppo
r
t saving
of files
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
Ne
i
l
Brown
vpatch:
Allow
a
m
ess
a
ge to be displayed in main folder
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
Separate make
_
merger out from print_me
r
ge2
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBro
w
n
vpatch: remove lots of me
m
ory leaks
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
N
eilBro
w
n
v
p
a
tch: allow a f
i
le in li
s
t to be a 'merg
e
r' ins
t
e
a
d
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
NeilBro
w
n
vpatch
:
allow conflict to be ignored with 'x'
commit
|
commitdiff
|
tree
2012-11-13
NeilBrow
n
vpatch: change args to
v
isible()
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
N
e
ilBr
o
wn
vpatch: avoid extra bla
n
ks when cursor is in alternate
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
N
e
i
lBrown
vpatc
h
:
a
dd
'
space' and
'backspace' for
p
age up/down
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
NeilBrown
vpatch
:
highlight spaces wh
e
n they mi
g
ht be
import
a
nt
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
Neil
B
rown
v
patc
h
: make c
t
r
l-G search-again-f
o
rward
,
not
j
ust
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
NeilBr
o
w
n
vpa
t
ch:
fix check_line to
s
top at hunk head
e
rs
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-12
NeilBrown
vpa
t
ch: ensure searching for 'next change' works
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-12
NeilBrown
vpatch: revise the exact meaning of 'CHA
N
GES'
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-12
N
eilBrown
vpatch:
r
e
m
o
ve CH
A
NGED
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-11
NeilB
r
own
Browse:
ens
u
re we erase
a
ll of old type name when updating
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-11
NeilBrown
Browse:
g
it pro
b
le
m
in rend
e
r
i
n
g
fi
l
e
list
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-17
Nei
l
Brown
vp
a
tch - use 'cols' i
n
main
w
i
ndow
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-17
NeilBrown
config
.
h: in
c
lud
e
differe
n
t endi
a
n file
for OS/
X
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-17
NeilBrow
n
extract: removed unused
variable: line
n
o
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-15
N
eilBrown
m
e
rg
e
: make s
o
me conflicts less conflicting
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-15
N
eilBr
o
wn
Brow
s
er: fix in_c
o
nflict detecti
o
n while b
r
owsi
n
g
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-14
Neil
B
rown
Release 0
.
9
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-14
Neil Brow
n
man pa
g
e: a
d
d d
o
cumentation for
browse mode
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-14
Neil B
r
own
Bro
w
ser: add a bit
of co
l
our to the file-list page
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-14
N
e
il Brown
Merge: al
l
ow merging a multi-patch p
a
tc
h
f
i
le
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-13
Neil
Brown
main:
o
n
ly pass t
r
a
i
n
i
n
g
args to extract/do_diff/do_merge
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-13
N
e
il Brown
Mo
v
e
parse_p
a
tch
and relate
d
to
new par
s
e
.
c
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-12
Nei
l
Brown
A
l
low load_file to
load
s
egments t
o
o
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-12
Neil Bro
w
n
Min
o
r man-page
f
ixe
s
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-12
N
e
i
l Brown
Improve ma
k
e cl
e
a
n
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-12
Nei
l
Bro
w
n
Add e
n
dian
.
h back to config
.
h
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-11
Neil Brow
n
Browser: i
m
prove decision on whe
n
to split window for
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-11
N
e
il Brown
Browser
:
i
mprove rend
e
ring of co
n
flicts in the t
h
e
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-11
N
e
il
Brown
Br
o
w
s
e:
don't use ba
c
kgro
u
nd
colors for added/
d
eleted
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-11
Neil
B
rown
Browse: av
o
id
di
s
p
l
ay p
r
oblems when
changing
v
iew-mode
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
N
e
il Br
o
wn
i
solate_conflicts: don't
l
ook for
e
ol
t
hat
cann
o
t be
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Neil Brow
n
Don
'
t include endian
.
h
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Neil Brown
browser
:
d
ispl
a
y the
t
y
p
e of the
merge-node u
n
der the
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
N
e
il
B
rown
B
r
owser: allow cur
s
or
to
b
e
d
i
splayed in altern
a
te
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Neil
B
rown
browse/sea
r
ch: support selecti
v
ely ignorin
g
c
ase
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
N
e
il
Brown
bro
w
se/search: don't mat
c
h strings in the hunk-h
e
a
d
er
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
next