On Fri, 4 May 2018, Sven Schreiber wrote:
Am 03.05.2018 um 21:00 schrieb Allin Cottrell:
> On Thu, 3 May 2018, Sven Schreiber wrote:
>
>> Am 29.04.2018 um 20:42 schrieb Allin Cottrell:
>>
>> Thanks for this git-for-dummies guide.
>>
>>> 5. Then push your modification to sourceforge:
>>>
>>> git push
>>
>> And what should be done to make a proposed patch known but not apply /push
>> it right away? Something like: check if this would be OK.
>
> If I'm understanding you right, that would be a case for
>
> git diff > trythis.diff
And would that come before or after "git commit ..." ? (Before "git
push" in
any case, that much is clear.)
Part of my confusion/insecurity with git is the term "commit" which sounds
far-reaching but apparently isn't.
This is to do with the inherently distributed nature of git. I agree
it can be confusing. "commit" updates the metadata in your local copy
only; "push" sends the update to "origin" (in this case sourceforge).
As for "git diff": in its plain form this should come before "commit",
because after a local commit of the relevant file(s) there is no
"diff" between those files and (local) git's records. However, if you
do a commit first and then want to see how your local copy differs
from "origin" you can still do that with a modified command:
git diff origin/master
So the order doesn't really matter much. This sort of thing is spelled
out a bit more at
http://gretl.sourceforge.net/gretl-git-basics.html
Allin