Skip to content

Commit 2333aaa

Browse files
committed
Analyse -> Analyze
1 parent ff601a6 commit 2333aaa

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ObjectiveGit/GTRepository+Pull.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ typedef void (^GTRemoteFetchTransferProgressBlock)(const git_transfer_progress *
4141
/// will point to an error describing what happened).
4242
- (BOOL)pullBranch:(GTBranch *)branch fromRemote:(GTRemote *)remote withOptions:(nullable NSDictionary *)options error:(NSError **)error progress:(nullable GTRemoteFetchTransferProgressBlock)progressBlock;
4343

44-
/// Analyse which merge to perform
44+
/// Analyze which merge to perform
4545
///
4646
/// analysis - The resulting analysis.
4747
/// fromBranch - The remote to pull from.
4848
/// error - The error if one occurred. Can be NULL.
4949
///
5050
/// Returns YES if the analysis was successful, NO otherwise (and `error`, if provided,
5151
/// will point to an error describing what happened).
52-
- (BOOL)analyseMerge:(GTMergeAnalysis *)analysis fromBranch:(GTBranch *)fromBranch error:(NSError **)error;
52+
- (BOOL)analyzeMerge:(GTMergeAnalysis *)analysis fromBranch:(GTBranch *)fromBranch error:(NSError **)error;
5353

5454
@end
5555

ObjectiveGit/GTRepository+Pull.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ - (BOOL)pullBranch:(GTBranch *)branch fromRemote:(GTRemote *)remote withOptions:
7575
}
7676

7777
GTMergeAnalysis analysis = GTMergeAnalysisNone;
78-
BOOL success = [self analyseMerge:&analysis fromBranch:trackingBranch error:error];
78+
BOOL success = [self analyzeMerge:&analysis fromBranch:trackingBranch error:error];
7979
if (!success) {
8080
return NO;
8181
}
@@ -133,7 +133,7 @@ - (BOOL)pullBranch:(GTBranch *)branch fromRemote:(GTRemote *)remote withOptions:
133133
return NO;
134134
}
135135

136-
- (BOOL)analyseMerge:(GTMergeAnalysis *)analysis fromBranch:(GTBranch *)fromBranch error:(NSError **)error
136+
- (BOOL)analyzeMerge:(GTMergeAnalysis *)analysis fromBranch:(GTBranch *)fromBranch error:(NSError **)error
137137
{
138138
NSParameterAssert(analysis != NULL);
139139
NSParameterAssert(fromBranch != nil);

0 commit comments

Comments
 (0)