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...
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):
In your ~/.gitconfig: [core] editor=nano
tig path_to_file_or_files_or_path_with_wildcard
It’s pretty common for projects hosted on GitHub to receive “pull requests”: requests from people who have cloned your project, made a modification to it and then asking you...
...good time to upgrade our deployment process. Currently pushing out a new version of GitHub takes upwards of 15 minutes. Ouch. My goal: one minute deploys (excluding server restart time...
...the branch name from Linear (keyboard shortcut Ctrl-Shift-.). Branch off the main with: git checkout main git checkout -b $PASTE_BRANCH_NAME_HERE If your feature depends on another...
...merge request checklist: Within your feature branch, merge the current main and push using: git pull origin main git push -u origin feature-branch-name You're encouraged to use...
...deploy new features but the latest commits are not ready for production? Then use git merge master~n to skip the n-last commits. Tip A big advantage of merging...
...duplicate commit messages in your history. Example It's time for a production deployment! git log --pretty=format:"%h - %s" --reverse origin/production..origin/master 0e6ab39f - Feature A 6396de5f - Feature B...
...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"
...Make an initial commit with Linear ID and the name of the issue using git commit --allow-empty -m Read the complete issue Reread the complete Issue and check if...
...the merge request Within your feature branch, merge the current master and push using: git pull origin master git push -u origin feature-branch-name You're encouraged to use...
tig is a command line explorer for Git that is just awesome. Install via apt-get or brew. Handy commands t ("tree"): Directory-structure based access. You'll see the...
...with the commit list filtered to those that touched the given file(s). Interactive Git status. Run tig status. Stage/unstage with U, navigate with ENTER/Q. Stash management. Call tig stash...
...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 has the concept of hooks: bash scripts that are invoked at certain points in the Git lifecycle. One handy use is a pre-push hook that runs Rubocop. It...
...will prevent pushing code that Rubocop finds fault with. Configuring the hook Git hooks are normally stored locally with a repository. They are not committed. Store this snippet in .git/hooks/pre-push...
...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...
The linked GitHub repository is a bit like our "dev" cards deck, but groomed from a single person (Josh Branchaud). It includes an extensive list of over 900 TILs on...
...many topics that might be interesting for most of us. (e.g. Ruby, Rails, Git, Unix..) Ruby Here is an excerpt of all the Ruby TILs that were new to me...
...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...
Sometimes you want git to ignore certain files that appear on your machine. You can do this in 3 ways: Per project, in the project's .gitignore file
...in a local exclude file Globally on your machine Downsides of per-project .gitignore entries While it might be tempting to set it per project (other devs might benefit from...
...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...
...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 in Cucumber scenarios If you haven't...
...als Container Image bauen und deployen kannst Du hast gelernt wie CI Jobs in Gitlab funktionieren Du weißt was Pipelines und Jobs sind Du kannst erklären was stages sind
Wenn eine Rule matched, werden dann die anderen noch evaluiert? Du kannst die Gitlab Container Registry verwenden Du kannst ECR verwenden Du hast Terraform mit CI Jobs verwendet
...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
Boot back into the regular Ubuntu system and install throttled: $ sudo apt install git build-essential python3-dev libdbus-glib...
...dev libgirepository1.0-dev libcairo2-dev python3-cairo-dev python3-venv python3-wheel $ git clone https://github.com/erpalma/throttled.git $ sudo ./throttled/install.sh as per the documentation, you should also disable thermald: $ sudo systemctl stop...
...eine schnelle Lösung gefunden werden. Vorbereitung Bitte beachte, dass du für die Beispiele im Git Repository des Buches zunächst die Ansible und die ansible requirements installieren musst: $ sudo apt install...
...dann mit vagrant up die VMs starten. Bitte beachte auch die README.md files im Git Repo zum Buch. Verbindung zu deinen VMs kannst du mit vagrant ssh aufbauen, wenn du...