[packages/rpm-build-tools.git] / fixmerge.sh

#!/bin/sh

# Changes the order of parents and commitlog in the merge produced by git pull. It produces
# the nicer history with git log --first-parent

git filter-branch -f --parent-filter "tee ~/P.OUT | awk '{if(NF==4) print \$1,\$4,\$3,\$2;}'| tee -a ~/P.OUT" \
    --msg-filter "sed 's/\(Merge branch .*\) of/\1 into/'" HEAD^!
Commit	Line	Data
dc99d75e KK	1	#!/bin/sh
	2
	3	# Changes the order of parents and commitlog in the merge produced by git pull. It produces
	4	# the nicer history with git log --first-parent
	5
	6	git filter-branch -f --parent-filter "tee ~/P.OUT \| awk '{if(NF==4) print \$1,\$4,\$3,\$2;}'\| tee -a ~/P.OUT" \
	7	--msg-filter "sed 's/\(Merge branch .*\) of/\1 into/'" HEAD^!