summaryrefslogtreecommitdiffstats
path: root/.bashrc-work
blob: ef9a7d8e6d241d568b8860ad3e21c9c73dbef403 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
# .bashrc-work

patch-suggested-change() {
	[ $# -ne 1 ] && int-usage "rej-file" && return
	local origfile=${1%.rej}
	{ echo "diff ${origfile}.patch ${origfile}.patch.orig"; colordiff -du \
	  <(tail -n+3 "${origfile}.rej") \
	  <(diff -du \
		"${origfile}" \
		<(wiggle --merge  "${origfile}" "${origfile}.rej") \
	  | tail -n+3)
	} | sed '2,4d;' | subdiff
	#} | subdiff | tail -n+5
}

patch-suggested-changes() {
	for f in $(find -name '*.rej'); do
		patch-suggested-change "${f}"
	done
}