git://git.jankratochvil.net
/
nethome.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
+.config/yt-dlp.conf
[nethome.git]
/
bin
/
vi-git-both-modified
1
#! /bin/bash
2
fis=""
3
for fi in $(git status|sed -n 's/^ both modified: *//p');do
4
if ! grep -q '^<<<<<<< ' $fi;then
5
git add $fi
6
continue
7
fi
8
fis="$fis $fi"
9
done
10
if [ -z "$fis" ];then
11
echo done
12
exit 0
13
fi
14
set -x
15
exec vim $fis