Re: [git-users] cannot commit or pull

[Magnus Therning]

Uwe Brauer <o...@mat.ucm.es> writes:

[[S/MIME Signed Part:Undecided]]

Uwe Brauer <o...@mat.ucm.es> writes:

If you read the text is says that it would _overwrite_ local

If all you want to do is get the upstream changes to your local
system you should look at the command `git fetch`.

changes. I think it's very nice of git to help you not lose work.

Ok, thanks, it seems that
hg pull -u <==> git fetch
git pull <==> hg fetch

Another, more `git` centric, way to think of `git pull` is as `git fetch` followed by `git merge`.

You should drop the `-b`, you switch to your branch using just

them with `git commit`.

`git checkout vc-diff-disp`. Then you need to stage your changes `git add lisp/vc/diff-mode.el lisp/vc/vc.el`, and finally commit

It turned out that I needed

git add lisp/vc/diff-mode.el
git add lisp/vc/vc.el


And that I really don't understand.
These files were modified not created.

Ok git checkout vc-diff-disp did work but I still could not commit.

- new files (make them known to `git`)
- changes to files already known to `git`




/M

--
Magnus Therning                   OpenPGP: 0x927912051716CE39
email: mag...@therning.org
@magthe@mastodon.technology       http://magnus.therning.org/


undone.
    — Pablo Picasso

--
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/87h7enmq5j.fsf%40therning.org.

In `git` you don't add files, you add (_stage_) changes. That is, you `git add` - parts of change to files already known to `git` (see `git add -p`) One big difference in `git`, at least IIRC from when I still used mercurial, is the concept of _staging_. Only put off until tomorrow what you are willing to die having left

signature.asc
Description: PGP signature