File tree Expand file tree Collapse file tree 2 files changed +31
-9
lines changed Expand file tree Collapse file tree 2 files changed +31
-9
lines changed Original file line number Diff line number Diff line change
1
+ # http://editorconfig.org
2
+
3
+ root = true
4
+
5
+ [* ]
6
+ indent_style = space
7
+ indent_size = 2
8
+ end_of_line = lf
9
+ charset = utf-8
10
+ trim_trailing_whitespace = true
11
+ insert_final_newline = true
12
+ max_line_length = 80
13
+ indent_brace_style = 1 TBS
14
+ spaces_around_operators = true
15
+ quote_type = auto
16
+
17
+ [package.json ]
18
+ indent_style = space
19
+ indent_size = 2
20
+
21
+ [* .md ]
22
+ trim_trailing_whitespace = false
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env sh
2
2
3
3
if test -n " $( git status --porcelain) " ; then
4
- echo ' Unclean working tree. Commit or stash changes first.' >&2 ;
5
- exit 128;
4
+ echo ' Unclean working tree. Commit or stash changes first.' >&2 ;
5
+ exit 128;
6
6
fi
7
7
8
8
if ! git fetch --quiet 2> /dev/null; then
9
- echo ' There was a problem fetching your branch.' >&2 ;
10
- exit 128;
9
+ echo ' There was a problem fetching your branch.' >&2 ;
10
+ exit 128;
11
11
fi
12
12
13
- CURRENT_BRANCH=` git rev-parse --abbrev-ref HEAD`
13
+ CURRENT_BRANCH=$( git rev-parse --abbrev-ref HEAD)
14
14
BRANCH=${1:- $CURRENT_BRANCH }
15
- git branch --set-upstream-to=origin/$BRANCH $BRANCH > /dev/null
15
+ git branch --set-upstream-to=origin/" $BRANCH " " $BRANCH " > /dev/null
16
16
17
17
if test " 0" ! = " $( git rev-list --count --left-only @' {u}' ...HEAD) " ; then
18
- echo ' Remote history differ. Please pull changes.' >&2 ;
19
- exit 128;
18
+ echo ' Remote history differ. Please pull changes.' >&2 ;
19
+ exit 128;
20
20
fi
21
21
22
- git branch --unset-upstream
22
+ git branch --unset-upstream
You can’t perform that action at this time.
0 commit comments