commit b08569c19d7748d0454eeb16c874927d6cdbaa85 parent 16537034775c55822c41c49045e910a8fd255574 Author: Antoine Amarilli <a3nm@a3nm.net> Date: Wed, 28 Dec 2016 01:55:58 +0100 git-merge-log Diffstat:
| git-merge-log | | | 6 | ++++++ |
1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/git-merge-log b/git-merge-log @@ -0,0 +1,6 @@ +#!/bin/bash +# merge lines that start with a timestamp + +cat "$1" "$2" "$3" | sort -k1,1n | uniq | grep '^[0-9]*\s' > "$2" +exit 0 +