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
vpatch: avoid repeated backups.
2012-11-14
Ne
i
lBrow
n
vpatc
h
: avoid repeat
e
d
backups
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatc
h
: prom
p
t to save
change if merge was e
d
itted
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrow
n
vpatch: allow a save
file to be restored
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBr
o
w
n
vpatch
:
support saving of files
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilB
r
o
w
n
vpat
c
h
:
A
llow a
m
essage to be displayed in
main f
o
l
d
e
r
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBro
w
n
Separate m
a
ke_merger
o
u
t
from p
r
i
nt_
m
erg
e
2
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-14
NeilBrown
vpatch: remove lots of memory leaks
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
Nei
l
Bro
w
n
v
patch: allow a file in
list to be a
'mer
g
er
'
i
n
stead
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
NeilBrown
vpatch: all
o
w co
n
f
l
ict to
b
e ignored
w
i
th
'x'
commit
|
commitdiff
|
tree
2012-11-13
NeilB
r
own
vpatch: change args to visible()
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
NeilBrown
v
p
atch: avoid ex
t
ra
blanks
w
hen cur
s
o
r
is in alternate
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
NeilBrow
n
v
p
atch: add 'space' and 'back
s
p
a
c
e
' for page up/down
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
N
e
ilBrown
vpa
t
ch: highlight
s
paces when they mi
g
ht be important
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
NeilBrow
n
vpatch: m
a
ke ct
r
l-G s
e
a
rch-again-for
w
ard, not
just
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-13
N
e
ilBrown
v
patch: fix
c
h
e
ck_l
i
ne to stop at
hunk
h
eaders
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-12
N
e
ilBrown
vpatch: ensure searching for '
n
ext change' works
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-12
Neil
B
rown
vpatch: revise the ex
a
c
t
mean
i
ng
o
f 'CHANG
E
S'
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-12
NeilBrown
vpatch: remove CHANGED
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-11
NeilBrown
Browse: ensure we erase a
l
l of o
l
d ty
p
e name
when updating
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-11-11
Neil
B
rown
Browse:
g
it proble
m
in r
e
nd
e
rin
g
f
ile li
s
t
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-17
NeilBrown
vpatch
- use 'cols' in mai
n
wi
n
do
w
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-17
NeilBrown
config
.
h: in
c
lude d
i
fferent endian file f
o
r OS/X
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-17
Nei
l
Brown
extract: remo
v
ed
u
n
used
v
ari
a
ble: line
n
o
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-15
NeilBrown
m
e
r
ge: m
a
k
e
some confli
c
ts
l
ess conflicting
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-15
Ne
i
lBrown
B
rowser
:
fix in_conflict
d
etection while b
r
owsing
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-14
Nei
l
Brown
R
e
l
ea
s
e 0
.
9
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-14
Neil Brown
ma
n
page: add document
a
tion for browse mode
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-14
Neil Br
o
wn
Browser: add
a
bit of
colo
u
r to the
f
ile-list page
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-14
Neil
B
r
own
Me
r
ge: allow
merging
a
multi-patc
h
pat
c
hfile
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-13
Nei
l
Brown
mai
n
: only pas
s
t
r
ai
n
i
ng args to ext
r
act/d
o
_d
i
f
f/do_merge
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-13
Neil Brown
Move parse
_
patch and related to
new
p
arse
.
c
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-12
Neil Brown
Allow load_
f
ile
t
o load segm
e
nts too
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-12
N
eil B
r
o
w
n
Min
o
r man-page f
i
xes
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-12
Neil Brown
Improve make clean
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-12
Neil Br
o
wn
Add e
n
dian
.
h back to con
f
i
g
.
h
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-11
Neil Brown
B
rowser
:
im
p
rove decisio
n
o
n w
h
en to spl
i
t window f
o
r
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-11
Neil
B
rown
Browser
:
im
p
r
ove r
e
ndering
of conflicts
i
n the
t
he
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-11
N
eil Brown
Browse: don't use
b
a
c
kground co
l
ors for added/deleted
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-11
Neil Brown
Browse: avoid
d
ispla
y
problems when changing view-mo
d
e
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Nei
l
Brow
n
is
o
late_
c
onflicts: d
o
n't look for eol
that
c
a
n
not be
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Neil Brown
D
on't include endian
.
h
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Ne
i
l
Brow
n
browser: d
i
sp
l
ay
the type of
t
he me
r
ge
-
n
o
de
u
nder the
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Nei
l
Br
o
wn
Brows
e
r: a
l
lo
w
cur
s
o
r
t
o be displayed in al
t
ernate
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Neil
B
r
own
br
o
wse/search: suppor
t
sele
c
tively i
g
noring c
a
se
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Neil Br
o
wn
browse/search:
don'
t
match st
r
ings in th
e
hunk-he
a
der
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Neil Brown
Browser: Support sear
c
hing
-
again within the same li
n
e
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Neil
B
rown
Browser: ch
a
nge
searchdir to
-
1
or +1
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Neil Brown
B
r
owser
:
Extend p
r
op
e
r curs
o
r
t
r
a
cking to search
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
Neil Br
o
wn
Brow
s
er:
U
s
e KEY_BACKSPACE
to rec
o
g
nise a backspace
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-10
N
e
il Br
o
wn
Browse
r
: add a
m
ore eff
e
ctive cursor
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-09
Neil Bro
w
n
browse: fix buffer
underflo
w
when closing dire
c
t
orie
s
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-09
Neil Brown
Add
a
nother reg
r
es
s
io
n
-test
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-08
N
e
il Brown
Init
i
al a
l
l of 'End' merg
e
r
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-08
Neil Bro
w
n
Avoid buffer overflow when checking for hunk head
e
r
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-08
N
eil Brown
mer
g
e: avoid
i
nclu
d
ing large
Unmatched sectio
n
s in
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-08
Neil Brown
Encourage more c
o
ntext i
n
t
o
conflict reports
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-08
Ne
i
l
Brown
m
erg
e
: factor out is_cut
p
o
int
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-08
Neil Bro
w
n
Improve handling of hunk-header
w
hen
m
e
r
ging
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-08
Neil Br
o
w
n
Ensure that a hunk-header never appears
in
t
he
middle
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Ne
i
l Brown
brows
e
r: clear the e
n
d of
t
h
e
s
plit-wind
o
w when needed
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Neil Brown
Add --sh
o
w
-
wiggle flag
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
N
e
il B
r
own
Handle some errors better in Browse mode
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
N
eil Brown
Make tracing
c
od
e
a
bit cleaner and more o
r
ganised
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Neil
Brown
Introduce
xm
a
lloc and us
e
it
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Neil Br
o
wn
Refactor do_diff sl
i
ght
l
y
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Neil
B
r
o
wn
Better
e
r
ror
message
i
f split_
p
atch fails for -
-
extract
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Ne
i
l Brown
S
p
lit do_diff_words and do_diff_lines
out from do_diff
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Neil Brown
M
in
o
r c
l
ea
n
ing up i
n
man page wi
g
gle
.
1
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Neil Brown
Remove extrac
t
ion of b
a
se-name
of
c
o
mmand
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Neil Brown
Split do_merge out from ma
i
n() a
s
a separate
f
u
n
ction
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Neil
B
r
own
Spli
t
do_diff() out from m
a
in()
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Neil Brown
split
'
extact' out of 'main' into a sep
a
rate f
u
nction
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Neil Brow
n
Replace hash
.
h with better hash func
t
ion from CCA
N
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Neil
Brow
n
Fix 'm
a
ke
v
ersio
n
'
NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Ne
i
l
Brown
.
gitignor
e
updat
e
s
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2012-05-07
Neil Brow
n
Gen
e
r
a
l cl
e
anups
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-12-07
Neil Brown
Si
l
ences
w
a
rn
i
ngs
about
s
et-bu
t
-n
o
t-used
v
ariables
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-12-07
Neil
B
r
o
wn
Stuff from mon
t
hs ago that I fo
r
g
e
t why
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-28
Neil
Brown
Remove merge
.
c
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-28
Ne
i
l
Brown
vp
a
tch
c
l
e
a
nup
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-26
Neil Brown
Fix
various typos in help
messag
e
s
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-24
Neil B
r
o
w
n
Clean
u
p
bestmatch
.
c
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-24
Nei
l
Brown
Clea
n
up split
.
c
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-24
Neil
Brown
Comment and tidy up
d
iff
.
c
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-24
Neil B
r
own
Clean up mor
e
valgrind error
s
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-22
Neil
Brow
n
Use Cmd var
i
nst
r
ead o
f
"
w
iggle"
in various e
r
ro
r
messa
g
es
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-22
Neil
Brown
Fix white sp
a
ce etc
i
ss
u
e
s report
e
d by ch
e
ckpatch
.
pl
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-22
N
e
il
Brown
Update dat
e
COPY
I
NG and FSF addre
s
s
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-22
Ne
i
l Br
o
wn
Fix use of unin
i
tial
i
sed var
s
in merg
e
2
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-22
Neil Brow
n
Avoid use of undefined variab
l
e
in bestmatch
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-22
Neil
B
rown
nul termin
a
te stream read from a f
i
le
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-22
Neil Br
o
wn
dotest: Ch
e
ck if /usr/bin/time
s
u
p
ports the needed
.
.
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-22
N
e
il Brown
S
top using c
a
se
r
anges
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-22
Ne
i
l Brow
n
Ask fo
r
m
ore w
a
rning
s
and fix some
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2011-08-22
Neil
Brown
Make lot
s
of
funct
i
ons "static"
.
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2010-05-12
Neil Brown
Change format of 'version' string
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2010-05-12
Nei
l
Brown
More options
for gi
v
ing patches to
-
-
brow
s
e
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2010-05-12
Nei
l
Bro
w
n
Us
e
g
it-archive to
c
reate a release
Signed-off-by: NeilBrown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
2010-05-05
Neil B
r
own
Write s
o
me notes about edi
t
ting
mer
g
e
s
.
commit
|
commitdiff
|
tree
2010-04-04
Neil Brown
browse: allow sel
e
c
tive li
s
ting of only files with
.
.
.
Signed-off-by: Neil Brown <
neilb@suse.de
>
commit
|
commitdiff
|
tree
next