search for: unstag

...0649), done. remote: Total 46530 (delta 33241), reused 46530 (delta 33241) Receiving objects: 100% (46530/46530), 5.94 MiB | 63 KiB/s, done. Resolving deltas: 100% (33241/33241), done. $ git-status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: .gitmodules # new file: vendor/plugins/rspec # new file: vendor/plugins/rspec-rails # $ git-submodule init Submodule ''vendor/plugins/rspec'' (git://github.com/dchelimsky/rspec.git) registered for path ''vendor/plugins/rspec''...

...n po/pt_PT.po Automatic merge failed; fix conflicts and then commit the result. How can I see the conflicts? I guess they are actually the changes I've sent in the first place. But I'm not sure how to deal with this. I also tried: > git fetch; git rebase origin cannot rebase: you have unstaged changes U po/pt_PT.po M po/pt_PT.po How can I make this work??

...* > > >D:\upstream\llvm-project>git add llvm/test/Transforms > >D:\upstream\llvm-project>git status >On branch master >Your branch is up to date with 'origin/master'. > >Changes to be committed: > (use "git restore --staged <file>..." to unstage) > modified: llvm/test/Transforms/NewGVN/todo-pr42422-phi-of-ops.ll > > >D:\upstream\llvm-project>git checkout -b mypatch >Switched to a new branch 'mypatch' > >D:\upstream\llvm-project>git status >On branch mypatch >Changes to be committed: >...

I think I understand the concepts, but I sure would appreciate a specific example, and I appreciate the offer. To make your life harder, could you start with what I should do given that I have not created a branch for the first patch? I just have the six files staged. I have GitHub Desktop installed, if that makes any of the steps easier. Thanks again, and no rush! At 8/10/2020 10:07 AM,

On Wed, Jun 1, 2016 at 6:31 PM, Renato Golin <renato.golin at linaro.org> wrote: > I think we should start two other threads: one about git tooling on Windows > and one about infrastructure problems migrating to git. Some developers on Windows prefer to use GUI tools like TortoiseSVN to command line tools for version control. The last time I tried TortoiseGit on Windows (which was

Hi Vishal, Ruijie, Thanks for your interest in the project. To get started, the first task would be to merge the 5 patches on top of trunk llvm. The list of patches are listed in the project description: http://llvm.org/OpenProjects.html#llvm_mergesim Please create an account in llvm phabricator (reviews.llvm.org) if you haven't already, and put your patches there. Let me know if you have