[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [gnustep/libs-base] 79f738: Merge pull request #10 from gnustep/mast
|
From: |
Ivan Vučica |
|
Subject: |
Re: [gnustep/libs-base] 79f738: Merge pull request #10 from gnustep/master |
|
Date: |
Thu, 22 Apr 2021 21:12:36 +0100 |
Can we please all rebase commits before merging, rather than merging
merge commits?
On Fri, Nov 13, 2020 at 2:31 PM 'rfm' via gnustep-commits
<gnustep-commits@googlegroups.com> wrote:
>
> Branch: refs/heads/master
> Home: https://github.com/gnustep/libs-base
> Commit: 79f738ceb1dc9ebd4b39db1914faca61f5b175e7
>
> https://github.com/gnustep/libs-base/commit/79f738ceb1dc9ebd4b39db1914faca61f5b175e7
> Author: Adam Fox <adam.fox@testplant.com>
> Date: 2020-10-12 (Mon, 12 Oct 2020)
>
> Changed paths:
> M .gitignore
> M .travis.yml
> M ANNOUNCE
> M ChangeLog
> M Documentation/ReleaseNotes.gsdoc
> M Documentation/announce.texi
> M Documentation/news.texi
> M Examples/dictionary.m
> M Examples/nsconnection_client.m
> R Headers/Foundation/MISSING
> M Headers/Foundation/NSAttributedString.h
> M Headers/Foundation/NSCalendar.h
> M Headers/Foundation/NSError.h
> M Headers/Foundation/NSException.h
> M Headers/Foundation/NSFilePresenter.h
> M Headers/Foundation/NSKeyedArchiver.h
> M Headers/Foundation/NSLocale.h
> M Headers/Foundation/NSNotification.h
> M Headers/Foundation/NSObjCRuntime.h
> M Headers/Foundation/NSOperation.h
> M Headers/Foundation/NSPropertyList.h
> M Headers/Foundation/NSURL.h
> M Headers/Foundation/NSURLProtocol.h
> M Headers/Foundation/NSURLRequest.h
> M Headers/Foundation/NSUUID.h
> M Headers/Foundation/NSXMLParser.h
> M Headers/Foundation/NSXPCConnection.h
> M Headers/GNUstepBase/GNUstep.h
> M Headers/GNUstepBase/GSConfig.h.in
> M Headers/GNUstepBase/GSIMap.h
> M Headers/GNUstepBase/GSVersionMacros.h
> M Headers/GNUstepBase/GSXML.h
> M Headers/GNUstepBase/config.h.in
> A MISSING
> M NEWS
> M README.initialize
> M Resources/Languages/Locale.canonical
> M Resources/Languages/README
> M Source/Additions/GSInsensitiveDictionary.m
> M Source/Additions/GSMime.m
> M Source/Additions/GSObjCRuntime.m
> M Source/Additions/GSXML.m
> M Source/Additions/NSArray+GNUstepBase.m
> M Source/Additions/NSData+GNUstepBase.m
> M Source/Additions/NSObject+GNUstepBase.m
> M Source/Additions/NSProcessInfo+GNUstepBase.m
> M Source/Additions/NSPropertyList+GNUstepBase.m
> M Source/Additions/NSURL+GNUstepBase.m
> R Source/CharSets/URLFragmentAllowedCharSet.h
> R Source/CharSets/URLHostAllowedCharSet.h
> R Source/CharSets/URLPasswordAllowedCharSet.h
> R Source/CharSets/URLPathAllowedCharSet.h
> R Source/CharSets/URLQueryAllowedCharSet.h
> R Source/CharSets/URLUserAllowedCharSet.h
> M Source/GSAttributedString.m
> M Source/GSDictionary.m
> M Source/GSNetwork.h
> M Source/GSSocketStream.m
> M Source/GSString.m
> M Source/GSTLS.m
> M Source/NSBundle.m
> M Source/NSCalendar.m
> M Source/NSCharacterSet.m
> M Source/NSCharacterSetData.h
> M Source/NSConcreteMapTable.m
> M Source/NSConnection.m
> M Source/NSData.m
> M Source/NSDateComponentsFormatter.m
> M Source/NSDictionary.m
> M Source/NSError.m
> M Source/NSException.m
> M Source/NSFileManager.m
> M Source/NSFileWrapper.m
> M Source/NSHTTPCookie.m
> M Source/NSHost.m
> M Source/NSISO8601DateFormatter.m
> M Source/NSInvocationOperation.m
> M Source/NSJSONSerialization.m
> M Source/NSKeyValueObserving.m
> M Source/NSKeyedArchiver.m
> M Source/NSKeyedUnarchiver.m
> M Source/NSLocale.m
> M Source/NSLog.m
> M Source/NSNotification.m
> M Source/NSObject.m
> M Source/NSOperation.m
> M Source/NSOrthography.m
> M Source/NSPersonNameComponentsFormatter.m
> M Source/NSPortCoder.m
> M Source/NSPredicate.m
> M Source/NSProcessInfo.m
> M Source/NSSocketPortNameServer.m
> M Source/NSString.m
> M Source/NSTask.m
> M Source/NSThread.m
> M Source/NSTimer.m
> M Source/NSURL.m
> M Source/NSURLProtocol.m
> M Source/NSURLRequest.m
> M Source/NSURLResponse.m
> M Source/NSUUID.m
> M Source/NSUnarchiver.m
> M Source/NSUserDefaults.m
> M Source/NSValueTransformer.m
> M Source/NSXMLParser.m
> M Source/NSXPCConnection.m
> M Source/inet_ntop.m
> M Source/inet_pton.m
> M Source/objc-load.m
> M Source/unix/NSStream.m
> M Source/win32/GSFileHandle.m
> M Source/win32/NSMessagePort.m
> M Tests/GNUmakefile
> M Tests/base/GSTLS/basic.m
> M Tests/base/NSBundle/GNUmakefile.preamble
> M Tests/base/NSBundle/Resources/GNUmakefile
> M Tests/base/NSBundle/resources2.m
> M Tests/base/NSCalendar/features-10-7.m
> M Tests/base/NSCharacterSet/general.m
> M Tests/base/NSDictionary/general.m
> M Tests/base/NSFileManager/general.m
> M Tests/base/NSHTTPCookie/basic.m
> M Tests/base/NSLocale/general.m
> M Tests/base/NSMapTable/weakObjects.m
> M Tests/base/NSNotification/basic.m
> M Tests/base/NSProxy/test00.m
> M Tests/base/NSProxy/test01.m
> M Tests/base/NSString/NSString_tests.h
> M Tests/base/NSString/basic.m
> M Tests/base/NSString/test09.m
> M Tests/base/NSThread/late_unregister.m
> M Tests/base/NSURL/Helpers/keepalive.m
> M Tests/base/NSURL/Helpers/respond.m
> M Tests/base/NSURL/basic.m
> A Tests/base/NSURL/charsets.m
> A Tests/base/NSURL/components.m
> M Tests/base/NSUserDefaults/general.m
> A Tests/base/NSValueTransformer/TestInfo
> A Tests/base/NSValueTransformer/basic.m
> M Tests/base/NSXMLParser/basic.m
> M Tests/base/NSXMLParser/parse.m
> M Tools/AGSHtml.m
> M Tools/AGSIndex.m
> M Tools/AGSOutput.m
> M Tools/cvtenc.m
> M Tools/gdomap.8
> M Tools/gdomap.c
> M config/config.reuseaddr.c
> M configure
> M configure.ac
> M travis-deps.sh
>
> Log Message:
> -----------
> Merge pull request #10 from gnustep/master
>
> Pull latest master branch changes into our fork.
>
>
> Commit: 0b69d88ee20f2c8f2c5678b3b1e7ef736504e0b4
>
> https://github.com/gnustep/libs-base/commit/0b69d88ee20f2c8f2c5678b3b1e7ef736504e0b4
> Author: Adam Fox <adam.fox@eggplant.io>
> Date: 2020-10-12 (Mon, 12 Oct 2020)
>
> Changed paths:
> M ChangeLog
> M Headers/Foundation/NSData.h
> M Source/NSData.m
> A Tests/base/NSData/search.m
>
> Log Message:
> -----------
> Implementation of [NSData rangeOfData:options:range], adapted from
> [NSString rangeOfString:options:range].
>
>
> Commit: a34beadb8effc6f6d811e0631ad4f13301ae6cb4
>
> https://github.com/gnustep/libs-base/commit/a34beadb8effc6f6d811e0631ad4f13301ae6cb4
> Author: Richard Frith-Macdonald <rfm@gnu.org>
> Date: 2020-11-13 (Fri, 13 Nov 2020)
>
> Changed paths:
> M ChangeLog
> M Headers/Foundation/NSData.h
> M Source/NSData.m
> A Tests/base/NSData/search.m
>
> Log Message:
> -----------
> Merge branch 'gnustep_testplant_mergeback' of
> https://github.com/TestPlant/libs-base into
> TestPlant-gnustep_testplant_mergeback
>
> Conflicts:
> ChangeLog
>
>
> Commit: 9794bece2efaecccca9bc800b66ff70d9c1e6da0
>
> https://github.com/gnustep/libs-base/commit/9794bece2efaecccca9bc800b66ff70d9c1e6da0
> Author: Richard Frith-Macdonald <rfm@gnu.org>
> Date: 2020-11-13 (Fri, 13 Nov 2020)
>
> Changed paths:
> M ChangeLog
> M Headers/Foundation/NSData.h
> M Source/NSData.m
> A Tests/base/NSData/search.m
>
> Log Message:
> -----------
> Merge branch 'TestPlant-gnustep_testplant_mergeback'
>
>
> Commit: 23d431234ca5b573b240b27ab7b2da080cad2a8d
>
> https://github.com/gnustep/libs-base/commit/23d431234ca5b573b240b27ab7b2da080cad2a8d
> Author: Richard Frith-Macdonald <rfm@gnu.org>
> Date: 2020-11-13 (Fri, 13 Nov 2020)
>
> Changed paths:
> M Source/NSData.m
>
> Log Message:
> -----------
> Fix bug in offset
>
>
> Compare:
> https://github.com/gnustep/libs-base/compare/3bba338dab35...23d431234ca5
>
> --
> You received this message because you are subscribed to the Google Groups
> "gnustep-commits" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to gnustep-commits+unsubscribe@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/gnustep-commits/gnustep/libs-base/push/refs/heads/master/3bba33-23d431%40github.com.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [gnustep/libs-base] 79f738: Merge pull request #10 from gnustep/master,
Ivan Vučica <=