It’s not possible. The changes you commit are related to the current working copy. If you want to commit to another branch it means that you could commit changes from your working copy, but base them from another copy state. This is not a natural way of versioning your work, and this is why you … Read more
I finally managed to solve it. The answer is: git filter-branch –tree-filter ‘~/Scripts/fix-line-endings.sh’ — –all fix-line-endings.sh contains: #!/bin/sh find . -type f -a \( -name ‘*.tpl’ -o -name ‘*.php’ -o -name ‘*.js’ -o -name ‘*.css’ -o -name ‘*.sh’ -o -name ‘*.txt’ -iname ‘*.html’ \) | xargs fromdos After all line endings were fixed in all … Read more
Git does not have branch specific permissions. You can either make the whole repository read only to the people or create one private and one public repository and only push the development branch to the public on while keeping the master only in your private repository. Edit: For branch specific permissions, you need a server-side … Read more
Since git 2.29, released in october 2020, you can leverage negative refspec to exclude a specific branch to be fetched. For GitHub Pages, you can do it like so: git config –add remote.origin.fetch ‘^refs/heads/gh-pages’ And Dependabot: git config –add remote.origin.fetch ‘^refs/heads/dependabot/*’ You can read more about it on https://github.blog/2020-10-19-git-2-29-released/#user-content-negative-refspecs
There are two solutions not mentioned already that you can use: use a topic branch or use cherry-picking. Topic branch solution In the topic branch solution, you switch to branch ‘something’, create a branch to fix a bug e.g. ‘something-bugfix’, merge this branch into ‘something’ (fixing the bug), then merge this branch into ‘experimental’. $ … Read more
Subversion 1.5.x adds a lot of svn:mergeinfo properties, even on files/folders which you think have nothing to do with the merge. But Subversion still uses those to reduce the merge time for subsequent merges. If you don’t like those, you can safely remove those modified/added svn:mergeinfo properties from all files/folders which were not part of … Read more
This is a multi-part answer because there are two separate issues here that are tangling together now. Here’s a summary of what we’ll cover: main vs master error: src refspec main does not match any reconciling separate main and master branches Each of these is in its own section. main vs master Git itself has … Read more
You don’t need to build the gem locally. In your gemfile you can specify a github source with a ref, branch or tag. gem ‘rails’, git: ‘git://github.com/rails/rails.git’, ref: ‘4aded’ gem ‘rails’, git: ‘git://github.com/rails/rails.git’, branch: ‘2-3-stable’ gem ‘rails’, git: ‘git://github.com/rails/rails.git’, tag: ‘v2.3.5’ Then you run bundle install or the short form is just bundle. Read more … Read more
git log has option –first-parent, so you won’t get topic history. When merged from master, the master commits are the first parents in merge. Git log allows to display only those commits with –first-parent, so you get the right stuff.
Straightforward: Updating from a remote branch into a currently not checked-out branch master: git fetch origin master:master where origin is your remote and you are currently checked out in some branch e.g. dev. If you want to update your current branch in addition to the specified branch at one go: git pull origin master:master