...all minor and patch updates. Examples Bad source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "2.7.6" gem "rails", "~> 7.0.6" gem "sqlite3", "~> 1.4"
...remove this version constraint afterwards again. Good source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "2.7.6" gem "rails" gem "sqlite3" gem "puma"
RubyMine provides a visual tool for resolving merge conflicts locally. Follow Git > Resolve Conflicts in the context menu to open RubyMine's merge conflict tool. Left pane: local copy (read...
Some folks have started to keep their linux configuration in a git repository called "dotfiles". This sounds like a good idea. here are mine The idea is to keep all...
...config files in a ~/.dotfiles git repository, and symlink these files to all relevant places. This happens automatically with a rake task...
...included in diff Another is that now they will always be included in your git diff for merge requests. There are two options how you can address this:
...exclude from diff Luckily gitlab comes with a solution for this. You can ignore files for diffs within a project specific .gitattributes files like shown here: tmp/parallel_runtime_rspec.log -diff knapsack_rspec_report.json -diff...
git diff commit_hash -- path/to/file Provide any commit hashes or branch names like "master" for commit_hash...
...a web based code review system, facilitating online code reviews for projects using the Git version control system...
...the trainee curriculum. Installing the skills You need an SSH key registered with your GitLab account at code.makandra.de. If you haven't done that yet, follow GitLab's guide first...
...you will need it for pushing your code anyway. Then install the trainee skills: git clone git@code.makandra.de:makandra/trainee-skills.git ~/.claude/trainee-skills ~/.claude/trainee-skills/update.sh Start Claude Code and type /trainee- — the trainee skills should...
...on how the setup (with rbenv) might look like: # [...] RUN git clone --depth=1 https://github.com/rbenv/rbenv.git $HOME/.rbenv \ && git clone --depth=1 https://github.com/rbenv/ruby-build.git $HOME/.rbenv/plugins/ruby-build \ && echo 'eval "$(/root/.rbenv/bin/rbenv init...
then local PTID=$(echo "$1" | grep "[0-9]*" -o) # Allow URLs git log --oneline | grep "$PTID" | grep "^[a-z0-9]*" -o | xargs --no-run-if-empty git...
...the command like this: ptcommits 165086636 --stat. Up to three arguments are passed to git show. Example output: commit 048054b1df87576f7c59cc0161cc331c44d2ea6b Author: Foo Bar <foo@bar.com> Date: Fri Apr...
You can also tag deploys, so you can see deployed commits in the git log...
All the hidden and not hidden features of Git and GitHub...
...in succession the overhead starts to add up. If you do a lot of Git pushing and pulling or frequently need to SSH to a dev server, you’ve probably...
git command line options for automating common rebasing tasks, like adding a fix to a commit that was already rebased into the history...
When you are using git rebase and are currently editing a commit (due to a conflict, for example), you may want to know the current commit. [1]\ Luckily, there is...
...lots of useful stuff in the .git directory. Commit hash that you are currently applying cat .git/rebase-merge/stopped-sha Useful if you want to inspect the original commit for its changes, for...
The problem isn't that Git is to hard, it's that smart developers are impatient and have exactly zero tolerance for unexpected behavior in their tools. While Git is...
This bookmarklet grabs a PivotalTracker story title, transforms it into a valid git branch name and automatically prepends your initials and an optional abbreviation (for better tab completion). It will...
...following formats: If you cancel the first dialog or confirm it without entering text: git checkout -b kw/178298638-card-320-state-machines If you enter an abbreviation (e.g. stm in this case):
tig path_to_file_or_files_or_path_with_wildcard
...code before committing. Never commit a debugging breakpoint. You can achieve this by using git add -p and following the guidelines from the referred card above. If you are debugging...
...should be in a habit of reviewing your code before committing (e.g. by using git add -p). Never commit a debugging breakpoint. Debugging network traffic Your browser DevTools have a...
...and the programmed CLI tool. The code has been published for educational purposes on GitHub. The german bachelor's thesis has also been included for download at the end.
...called, the gem Rugged is used to read out the changes as listed in git status, which is sufficient since only file based coverage is used. After that the data...
...they will set it to "Review" on Linear and open a merge request on GitLab. You will receive an e-mail. Now review the code, either directly on GitLab, or...
...it into main yourself: Squash and merge into main Push Delete the branch with git push origin :feature-branch-name Set the corresponding issue to "Merged" Deploy to staging
...install once more Option 3 This should always work. Run bundle update GEMNAME Run git diff Gemfile.lock and notice all the updates you didn't want Revert the unwanted changes...
...other locked gems, it will fail. If you use this option, be sure to git diff your Gemfile.lock to see if the changes are what you expected...
...view the respective files or, for a short summary: /var/lib/apt/lists $ grep -E "(Package|Version)" ppa.launchpadcontent.net_git-core_ppa_ubuntu_dists_jammy_main_binary-amd64_Packages | paste - - | column -t
...Version: 1:2.41.0-0ppa1~ubuntu22.04.1 Package: git-all Version: 1:2.41.0-0ppa1~ubuntu22.04.1 Package: git-cvs Version: 1:2.41.0-0ppa1~ubuntu22.04.1 Package: git-daemon-run Version...
...in any circumstances, you may permit it. Ask someone if you are not sure. Github license pages or tldrlegal.com give a good overview about a license's permissions, limitations and...
Rubygem ntlm-http: bundle exec license_finder licenses add ntlm-http ruby --why https://github.com/trampoline/ntlm-http/blob/9a61eaf20bd93ba035c17a79df0e9c814ffe6f2e/lib/net/ntlm_http.rb Adding a hidden dependency Sometimes there may be a dependency the package manager...
...our gatekeeping: feature branches, code review, and squashed commits that keep history traceable with git blame. You use our merge request checklist on every merge request. You can explain how...
...the purpose of: Feature branches Code reviews Commit squashing (and the resulting traceability through git blame) Our Merge request checklist Read the card Before you make a merge request: Checklist...