Skip to content
This repository has been archived by the owner on Jan 2, 2025. It is now read-only.

Commit

Permalink
chore(direnv): setting git pull.rebase more gracefully
Browse files Browse the repository at this point in the history
  • Loading branch information
burdiyan committed Dec 1, 2023
1 parent ba5b20e commit 3f93778
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ export NIXPKGS_ALLOW_BROKEN=1
# like "Merge branch 'main' of <remote>".
# The slight inconvenience is that git won't pull into a dirty workspace,
# asking to stash or commit the changes before pulling.
git config pull.rebase true || true
if [ "$(git config --get pull.rebase)" != "true" ]; then
git config pull.rebase true
fi

use nix --max-jobs auto
watch_file shell.nix build/nix/**/*.nix
Expand All @@ -38,4 +40,4 @@ export VITE_APP_VERSION="0.0.100"
# Needed for the Go extension in VS Code to find the right toolchain.
export GOROOT="$(go env GOROOT)"

export VITE_HM_SENTRY_DESKTOP_DSN="https://8d3089ffb71045dc911bc66efbd3463a@o4504088793841664.ingest.sentry.io/4505527460429824"
export VITE_HM_SENTRY_DESKTOP_DSN="https://8d3089ffb71045dc911bc66efbd3463a@o4504088793841664.ingest.sentry.io/4505527460429824"

0 comments on commit 3f93778

Please sign in to comment.