[fpc-devel] Submitting patches using git

[Ryan Joseph]

> On Jul 20, 2019, at 3:01 PM, denisgolovan <denisgolovan at yandex.ru> wrote:
> 
> Generally it means all your feature branch commits are on top of origin/master.
> 
> It's a bit difficult to explain via text.
> Try doing "git log --graph" before and after doing rebase and you will see it changes in feature branch to be moved (or rebased) after origin/master last commit in your feature branch.

I’m doing lots of trials right now but I can’t seem to get rebase to work unless I squash all the commits in the feature branch first but then I lose my commit history. I don’t know what it did but I see it merged changes from previous commits and didn’t even include all the changes from master. Very confusing.

Here’s the results of "git log —graph” on the feature branch. Does that first part look right? I feel like I messed up something from the very start but I’m not sure what.

Ryans-MacBook-Pro-2:fpc-git ryanjoseph$ git log --graph
* commit c5a6c2c0822d6c869a788a98a144e739a97d517a (HEAD -> generic_constants, origin/generic_constants)
| Author: Ryan Joseph <genericptr at gmail.com>
| Date:   Sat Jul 20 09:40:58 2019 -0400
| 
|     fixed bugs with range checking and constants + added 2 tests
| 
* commit 49de8113a1eb29b368d89d9e2fb7fa7c932d937e
| Author: Ryan Joseph <genericptr at gmail.com>
| Date:   Mon Mar 25 10:35:47 2019 -0400
| 
|     reverted back bad line endings in htypechk.pas
| 
* commit 128d695bf83fb19de342d8e23101ec0223e08e1b
| Author: Ryan Joseph <genericptr at gmail.com>
| Date:   Fri Mar 22 13:10:12 2019 -0400
| 
|     added 2 more tests
| 
* commit 4dcdd8932d5bc50b5d87bc8e1f1a7ea4e6d5b29f
| Author: Ryan Joseph <genericptr at gmail.com>
| Date:   Tue Mar 19 09:18:39 2019 -0400
| 
|     Fixed more operator bugs and added test
| 
* commit f2039f13c74e74cb523076b27ff6559ae69ad7d1
:


Regards,
	Ryan Joseph