File tree Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -215,6 +215,11 @@ extension IntegerType {
215
215
}
216
216
}
217
217
218
+ //===--- SignExtending ----------------------------------------------------===//
219
+ // A SignedIntegerType wrapper over any UnsignedIntegerType; it
220
+ // represents the full width of the unsigned number by adding bits
221
+ // to the representation.
222
+
218
223
//===--- Homogeneous comparison -------------------------------------------===//
219
224
@_transparent
220
225
@warn_unused_result
Original file line number Diff line number Diff line change @@ -50,7 +50,11 @@ def update_working_copy(repo_path):
50
50
if os .path .isdir (os .path .join (".git" , "svn" )):
51
51
update_git_svn (repo_path )
52
52
elif os .path .isdir (".git" ):
53
- check_call ([ "git" , "pull" , "--rebase" ])
53
+ # Prior to Git 2.6, this is the way to do a "git pull
54
+ # --rebase" that respects rebase.autostash. See
55
+ # http://stackoverflow.com/a/30209750/125349
56
+ check_call ([ "git" , "fetch" ])
57
+ check_call ([ "git" , "rebase" , "FETCH_HEAD" ])
54
58
else :
55
59
check_call ([ "svn" , "update" ])
56
60
You can’t perform that action at this time.
0 commit comments