> Uwe Brauer <o...@mat.ucm.es> writes:
> If you read the text is says that it would _overwrite_ local > changes. I think it's very nice of git to help you not lose work. > If all you want to do is get the upstream changes to your local > system you should look at the command `git fetch`. Ok, thanks, it seems that hg pull -u <==> git fetch git pull <==> hg fetch > You should drop the `-b`, you switch to your branch using just > `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 > them with `git commit`. Ok git checkout vc-diff-disp did work but I still could not 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. > I think you'd find it very worthwhile investing time in learning > the differences between git and mercurial. Using mercurial you've > learnt a lot of things that are general to distributed version > control, but you can't transfer _all_ your mercurial knowledge to > git. I usually rely on the hg-git Rosetta, but yes some basic concepts are different, for example git's difference between local and remote or a bare repositories. Anyhow using the add command I could commit. Regards Uwe -- 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/87h7enn0ao.fsf%40mat.ucm.es.
smime.p7s
Description: S/MIME cryptographic signature
