Skip to content

Commit

Permalink
notes
Browse files Browse the repository at this point in the history
  • Loading branch information
BostX committed Oct 16, 2023
1 parent 384ad84 commit c180291
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 8 deletions.
7 changes: 7 additions & 0 deletions notes/emacs.scrbl
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,14 @@
;; package descriptor; It the file doesn't exit the package will not appear in
;; the M-x list-packages
<package-name>-pkg.el

# mu4e - see also https://systemcrafters.net/emacs-mail/
mbsync --all
mu init --maildir=~/Mail [email protected]
mu index

}

@block{@block-name{french keyboard / clavier français}
M-x set-input-method RET french-keyboard
# ~ 1 2 3 4 5 6 7 8 9 0 _ + BACKSPACE
Expand Down
25 changes: 17 additions & 8 deletions notes/git.scrbl
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@
git log master --author=John
git shortlog master --author=John

# show settings
git config --global --list
# show settings: --local use .git/config; --global use ~/.gitconfig
git config --local --list
git config --global --list --get <setting>
git config --local --list --get <setting>
git config --local --get <setting>
git config --global --list
git config --global --get <setting>

# set user.name and user.mail
git config --global user.name "Bost"
Expand All @@ -269,7 +269,7 @@

# github add new repository: create a new repo on www.github.com, then:
git remote add origin git@"@"github.com:Bost/<newrepo>.git
git push -u origin master
git push --set-upstream origin master

# github: do not ask for username
.git/config: url = https://Bost@"@"github.com/Bost/reponame.git
Expand Down Expand Up @@ -407,11 +407,14 @@
# git merge --continue # in case any conflicts; after resolving them
git remote remove srcProj

# Sign all commits by default
git config --file $dotf/.gitconfig --get commit.gpgsign
# Sign git commits
gpg --list-secret-keys --keyid-format=long
set personName <...>
gpg --list-public-keys --keyid-format=long $personName
gpg --list-secret-keys --keyid-format=long $personName
set --local keyId <secret-key-id>
# Sign all commits by default
git config --file $dotf/.gitconfig user.signingkey --gpg-sign=$keyId
git config --file $dotf/.gitconfig user.signingkey $keyId
git rebase --exec \
'git commit --amend --no-edit -n --gpg-sign=$keyId' \
origin/master master
Expand All @@ -427,6 +430,12 @@
#
pkill gpg-agent
gpg-agent --pinentry-program=$(which pinentry) --daemon

# delete all remote/origin branches except 'master'
git --git-dir=$dgx/.git branch --all | \
rg 'remotes/origin/' | rg -v master | \
cut --delimiter="/" --fields=2,3 | \
xargs git --git-dir=$dgx/.git branch --remote --delete
}

@block{@block-name{Mercurial}
Expand Down

0 comments on commit c180291

Please sign in to comment.