File: post-merge

package info (click to toggle)
libreoffice 1%3A3.5.4%2Bdfsg2-0%2Bdeb7u4
  • links: PTS, VCS
  • area: main
  • in suites: wheezy
  • size: 2,691,824 kB
  • sloc: cpp: 4,679,091; java: 395,153; xml: 170,215; ansic: 99,333; perl: 60,572; python: 27,776; sh: 17,789; makefile: 8,738; yacc: 8,219; cs: 6,648; asm: 3,257; objc: 2,349; lex: 2,103; pascal: 890; awk: 758; csh: 247; lisp: 115; php: 104; sed: 9
file content (12 lines) | stat: -rwxr-xr-x 377 bytes parent folder | download | duplicates (33) 
1
2
3
4
5
6
7
8
9
10
11
12
 
#!/bin/bash

# Do not warn if there were no real merge
git rev-parse -q --verify HEAD^2 >/dev/null || exit

echo
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo "! You probably used 'git pull' instead of 'git pull -r' !"
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo
echo "You can still fix it - please do 'git pull -r' now."
echo