Merge pull request #16 from sephlietz/squash-with-both-messages

Include both commit messages in squash

Author: swisspol

GitUpKit/Views/GIMapViewController+Operations.m

@@ -225,7 +225,9 @@ - (void)swapCommitWithChild:(GCHistoryCommit*)commit {
 
 - (void)squashCommitWithParent:(GCHistoryCommit*)commit {
   if ([self checkCleanRepositoryForOperationOnCommit:commit]) {
-    [self _promptForCommitMessage:_CleanedUpCommitMessage(commit.message)
+    GCHistoryCommit* parentCommit = commit.parents.firstObject;
+    NSString* mergedMessage = [NSString stringWithFormat:NSLocalizedString(@"%@\n\n%@", nil), _CleanedUpCommitMessage(parentCommit.message), _CleanedUpCommitMessage(commit.message)];
+    [self _promptForCommitMessage:mergedMessage
                         withTitle:NSLocalizedString(@"Squashed commit message:", nil)
                            button:NSLocalizedString(@"Squash", nil)
                             block:^(NSString* message) {