how to ignore the path of a file from git status after adding the files to .gitignore?
I have a git repository , where I have *.iml files. To ignore them I have added below to .gitignore
How can I get rid of this?
See also questions close to this topic
How to use git on an adapted file?
I'd like to take code from another project and adapt it for use in my program.
I only need a couple of files from the project and don't want to make a fork of the whole repo (the fork wouldn't be functional anyway).
I plan to reformat the code, change the names of some functions, and make some deletions/changes.
I could just copy the necessary files into my source tree and make my modifications, but this would not be future-proof for when the original project changes. How should I use git to keep track of changes to the original file and merge them into the modified version that I've incorporated into my project?
git diff show just directories, not all new files
If I have a repository where I add new subdirectories and make changes to files, when I run
git status, I see a summary
$ git status On branch test Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: composer.json modified: composer.lock modified: vendor/composer/autoload_psr4.php modified: vendor/composer/autoload_static.php modified: vendor/composer/installed.json Untracked files: (use "git add <file>..." to include in what will be committed) modules/contrib/a11y_paragraphs_tabs/ vendor/jakubsuchy/ no changes added to commit (use "git add" and/or "git commit -a")
When I add and commit those files, and then do
git diff --stat master, it shows me all the the file names, including those in the new directories:
$ git diff --stat master composer.json | 5 +- composer.lock | 207 ++++++++++++++++++++++++++++++++- modules/contrib/a11y_paragraphs_tabs/LICENSE.txt | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ modules/contrib/a11y_paragraphs_tabs/README.md | 88 ++++++++++++++ modules/contrib/a11y_paragraphs_tabs/a11y_paragraphs_tabs.info.yml | 14 +++ modules/contrib/a11y_paragraphs_tabs/a11y_paragraphs_tabs.install | 33 ++++++ modules/contrib/a11y_paragraphs_tabs/a11y_paragraphs_tabs.libraries.yml | 17 +++ modules/contrib/a11y_paragraphs_tabs/a11y_paragraphs_tabs.module | 46 ++++++++ .../config/optional/core.entity_form_display.paragraph.a11y_paragraphs_tab_content.default.yml | 25 ++++ .../config/optional/core.entity_form_display.paragraph.a11y_paragraphs_tabs_panel.default.yml | 39 +++++++ .../config/optional/core.entity_form_display.paragraph.a11y_paragraphs_tabs_wrapper.default.yml | 39 +++++++ .../config/optional/core.entity_view_display.paragraph.a11y_paragraphs_tab_content.default.yml | 21 ++++ .../config/optional/core.entity_view_display.paragraph.a11y_paragraphs_tabs_panel.default.yml | 32 ++++++ .../config/optional/core.entity_view_display.paragraph.a11y_paragraphs_tabs_wrapper.default.yml | 32 ++++++ .../config/optional/field.field.paragraph.a11y_paragraphs_tab_content.field_a11y_para_tabs_text_area.yml | 20 ++++ .../config/optional/field.field.paragraph.a11y_paragraphs_tabs_panel.field_a11y_para_tabs_tab_content.yml | 36 ++++++ .../config/optional/field.field.paragraph.a11y_paragraphs_tabs_panel.field_a11y_para_tabs_tab_title.yml | 20 ++++ .../config/optional/field.field.paragraph.a11y_paragraphs_tabs_wrapper.field_a11y_para_tabs_sec_title.yml | 20 ++++ .../optional/field.field.paragraph.a11y_paragraphs_tabs_wrapper.field_a11y_para_tabs_tabs_panel.yml | 33 ++++++ .../a11y_paragraphs_tabs/config/optional/field.storage.paragraph.field_a11y_para_tabs_sec_title.yml | 19 +++ .../a11y_paragraphs_tabs/config/optional/field.storage.paragraph.field_a11y_para_tabs_tab_content.yml | 19 +++ .../a11y_paragraphs_tabs/config/optional/field.storage.paragraph.field_a11y_para_tabs_tab_title.yml | 19 +++ .../a11y_paragraphs_tabs/config/optional/field.storage.paragraph.field_a11y_para_tabs_tabs_panel.yml | 19 +++ .../a11y_paragraphs_tabs/config/optional/field.storage.paragraph.field_a11y_para_tabs_text_area.yml | 18 +++ .../a11y_paragraphs_tabs/config/optional/paragraphs.paragraphs_type.a11y_paragraphs_tab_content.yml | 8 ++ .../a11y_paragraphs_tabs/config/optional/paragraphs.paragraphs_type.a11y_paragraphs_tabs_panel.yml | 8 ++ .../a11y_paragraphs_tabs/config/optional/paragraphs.paragraphs_type.a11y_paragraphs_tabs_wrapper.yml | 8 ++ modules/contrib/a11y_paragraphs_tabs/css/a11y-paragraphs-tabs.css | 162 ++++++++++++++++++++++++++ modules/contrib/a11y_paragraphs_tabs/js/a11y-paragraphs-tabs.js | 6 + modules/contrib/a11y_paragraphs_tabs/templates/field--field-a11y-para-tabs-tabs-panel.html.twig | 3 + modules/contrib/a11y_paragraphs_tabs/templates/paragraph--a11y-paragraphs-tabs-wrapper.html.twig | 131 +++++++++++++++++++++
mules/contrib/nasa | 1 + vendor/composer/autoload_psr4.php | 1 + vendor/composer/autoload_static.php | 5 + vendor/composer/installed.json | 195 +++++++++++++++++++++++++++++++
37 files changed, 1683 insertions(+), 7 deletions(-)
Is there any way to do a
diff --statagainst another branch that looks just like the output of
git status? In other words, I would want to see this:
$ git diff --stat --summary? master composer.json | 5 +- composer.lock | 207 ++++++++++++++++++++++++++++++++- modules/contrib/a11y_paragraphs_tabs/ | some other stat here indicating files vendor/composer/autoload_psr4.php | 1 + vendor/composer/autoload_static.php | 5 + vendor/composer/installed.json | 195 +++++++++++++++++++++++++++++++ 37 files changed, 1683 insertions(+), 7 deletions(-)
That, if the other branch doesn't contain the directory, just list the directory, and not all it files and subdirectories.
Where does git merge fit in this diagram
I am learning git/github/version control and I found the diagram below really useful (source). My question is where does
git mergefit into this diagram? Where would the arrow start and point to?
Pull request shows up twice? (First time handling pull request)
I'm a new dev who recently made my project open source. Merged my first pull request using the github GUI and it prompted me to edit the title/body so I did. I go to check the commit page for the repo and it shows two commits both with the same code. First one is mine with the title change, second one is his original title. What I expected was to see a single commit with the title edited (my title).
Just curious why this happened, and what I can do to clean it up. Would deleting my recent commit and ammending his title/body be viable, or should I proceed in a different fashion?
R markdown web page hosted on github does not reflect _site.yml
I am using this tutorial to create a R markdown web page hosted on github: http://nickstrayer.me/RMarkdown_Sites_tutorial/
I created _site.yml, Index.Rmd, and build_site.R exactly as in the tutorial (copy/pasted). When I open index.html in a web browser from my local directory, index.html reflects the _site.yml style and appears as expected based on the tutorial (navigation bar at top, same as in the tutorial).
However, when I upload the index.html to github and view the page through the repository web page address as in the tutorial, the style is lost. There is no navigation bar, and the menu items just appear as text links.
I tried using multiple browsers, and the issue remained.
Installing TDOSE package using anaconda
I need to package from github using conda.
The usual approach is:
git clone https://github.com/....git cd sub-dir python setup.py install
However, the package I am trying to install (https://github.com/kasperschmidt/TDOSE) doesn't have
At which point I am at a loss. Is it still possible to install it?
getting 502 Error in gitlab creating project
I had Gitlab version 11.8 installed on the Santos server. I installed the old version and installed the new 12 version based on the Gitlab site instructions. Returns after installation when creating a new project. i cheacked log by this comman:
sudo gitlab-ctl tail
there was this error:
0.0.0.0:8080 failed (98: Address already in use)
GitlabCI: Artifact downloaded in the all the downstream jobs but some jobs failed with not found error
But another job fails
I am not sure if this is gitlabci issue or I am doing something wrong.
Thanks in advance.
Error 422 after installing gitlab on centos 7
I got into trouble after installing
CentOs7. For the first time I was redirected to the admin password creation page and after the password for the admin user, the server sent error.
422 The change you requested was rejected.
I had set the url value based on the site guide.
Set the external_url in /etc/gitlab/gitlab.rb:
I checked the links below for similar situations. I didn't find the right answer. My server was in the local area and had no internet access.