Hey, With "git add ." you just add files in your local directory. (I terribly hate when people use it if they are beginner with git, because they don't get how git works yet.)
You can't amend a commit which is not on your computer, which is expected, since than you could modify others commit too. It also gives you an error message you branch and the remote's branch differs which is also expected. So the 3 commits are expected. If you you don't know what you doing, firs read the Pro git book. It's quite a big book but it explains everything and it can be finished much faster if you skip some not useful chapters. (Like how to move to git from svn and so on.) Regards, Alexa On Tue, May 5, 2020, 04:05 SJW <shannon.whi...@gmail.com> wrote: > Cant edit post. > > Here is the commit log - i was expecting/hoping for a single commit - > instead I have 4 ???? > > $ git log > commit 0988bf8f5a165a6e213982cfcf0733ccb3452101 > Author: XXX > Date: Tue May 5 12:00:28 2020 +1000 > > > Trying to fix the merge issues that were created from ???? > > > commit a32b8a94f3baef1264e7f17993fe79063a057736 > Merge: 54c1612 0cc8698 > Author: XXX > Date: Tue May 5 11:28:58 2020 +1000 > > > Merge branch 'master' of https://gitlab.com/SJWGL/project > > > commit 54c1612be8c645fb14ca456bb56fa7b1979db9c7 > Author: XXX > Date: Tue May 5 10:16:30 2020 +1000 > > > Updates... > > > commit 0cc8698b634303b68e8a8568af503ed7576e3cc2 > Author: XXX > Date: Tue May 5 10:16:30 2020 +1000 > > > Updates... > > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/git-users/fadba795-f121-40bc-ae31-159975be4aee%40googlegroups.com > <https://groups.google.com/d/msgid/git-users/fadba795-f121-40bc-ae31-159975be4aee%40googlegroups.com?utm_medium=email&utm_source=footer> > . > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/CAErL4gj9wH502Y45K4mUBsRXqX_fkxWcN760XVgeGjeG5W%2B8tQ%40mail.gmail.com.
