post-merge 211 B

1234567
  1. #!/bin/bash
  2. set -e
  3. gitdir=$(git rev-parse --git-dir)
  4. rm -f "$gitdir"/MERGE_HEAD.bak
  5. mv "$gitdir"/MERGE_HEAD{,.bak} 2>/dev/null || true
  6. git date-truncate --tips
  7. mv "$gitdir"/MERGE_HEAD{.bak,} 2>/dev/null || true