- r=`git symbolic-ref HEAD`
- r=${r#refs/heads/}
- if git config branch.$r.remote >/dev/null 2>&1; then
- if ! verbose git pull; then
- check_mergeconflict "$d"
- echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
- read -r DUMMY
+ r=`git symbolic-ref HEAD`
+ r=${r#refs/heads/}
+ if git config branch.$r.remote >/dev/null 2>&1; then
+ if ! verbose git pull; then
+ check_mergeconflict "$d"
+ echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
+ read -r DUMMY
+ fi