Mercurial > hg > config

annotate .gitconfig @ 922:74dc16f074be default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ignore ff merges
author Jeff Hammel <k0scist@gmail.com>
date Thu, 03 Oct 2024 05:36:19 -0700
parents 06d2cc0fe045
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
223
ce34e4e8f357 add .gitconfig, oh the irony
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
1 [core]
ce34e4e8f357 add .gitconfig, oh the irony
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
2 excludesfile = /home/jhammel/.gitignore
ce34e4e8f357 add .gitconfig, oh the irony
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
3 [user]
ce34e4e8f357 add .gitconfig, oh the irony
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
4 name = Jeff Hammel
899
7ba1f770598c update email for BrightSign
Jeff Hammel <k0scist@gmail.com>
parents: 897
diff changeset
5 email = jhammel@brightsign.biz
902
06d2cc0fe045 add signing key
Jeff Hammel <k0scist@gmail.com>
parents: 901
diff changeset
6 signingkey = /Users/jhammel/.ssh/id_rsa.pub
223
ce34e4e8f357 add .gitconfig, oh the irony
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
7 [alias]
301
2a1eeec1b4ea add a git root command
Jeff Hammel <jhammel@mozilla.com>
parents: 288
diff changeset
8 branches = branch -a
818
352530cbf195 [gitconfig] rename this + make it work
Jeff Hammel <k0scist@gmail.com>
parents: 813
diff changeset
9 current-branch = rev-parse --abbrev-ref HEAD
315
f8ef5a974df8 add a discard command
Jeff Hammel <jhammel@mozilla.com>
parents: 313
diff changeset
10 discard = reset HEAD --hard
792
0aa1d72ef538 add log graph alias
Jeff Hammel <k0scist@gmail.com>
parents: 788
diff changeset
11 graph = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cd)%Creset' --abbrev-commit --date=relative
864
7191914724f0 [git] update name and fix syntax
Jeff Hammel <k0scist@gmail.com>
parents: 863
diff changeset
12 lo = log --oneline
336
b27ea86a9c9e alias to make patch
Jeff Hammel <jhammel@mozilla.com>
parents: 315
diff changeset
13 patch = !git diff > ~/$(git rev-parse --abbrev-ref HEAD).diff
424
d214e0f38ab1 -> pushbranch
Jeff Hammel <jhammel@mozilla.com>
parents: 392
diff changeset
14 pushbranch = !git push origin $(git rev-parse --abbrev-ref HEAD)
301
2a1eeec1b4ea add a git root command
Jeff Hammel <jhammel@mozilla.com>
parents: 288
diff changeset
15 root = rev-parse --show-toplevel
288
498210b6e1a9 add branches alias
Jeff Hammel <jhammel@mozilla.com>
parents: 223
diff changeset
16 st = status
788
fa3ad63ec3a3 https://github.com/novas0x2a/config-files/blob/master/.gitconfig#L89
Jeff Hammel <k0scist@gmail.com>
parents: 786
diff changeset
17 subscribe-pulls = !"f() { REMOTE=${1:-origin}; if ! git config --local --get-all remote.${REMOTE}.fetch | grep -q refs/pull; then echo 'subscribing...' 2>&1; git config --local --add remote.${REMOTE}.fetch '+refs/pull/*/head:refs/remotes/pr/*'; fi; }; f"
813
446107608d89 add undo for one level only
Jeff Hammel <k0scist@gmail.com>
parents: 792
diff changeset
18 undo = reset HEAD~
604
2786c3293fb5 STUB: .gitconfig
Jeff Hammel <k0scist@gmail.com>
parents: 428
diff changeset
19 up = !git pull origin master && git push origin master
728
6ba565f99696 cache credentials for a session
Jeff Hammel <k0scist@gmail.com>
parents: 604
diff changeset
20 wip = !git commit -a -m 'wip' && git push origin $(git rev-parse --abbrev-ref HEAD)
6ba565f99696 cache credentials for a session
Jeff Hammel <k0scist@gmail.com>
parents: 604
diff changeset
21
6ba565f99696 cache credentials for a session
Jeff Hammel <k0scist@gmail.com>
parents: 604
diff changeset
22 [credential]
813
446107608d89 add undo for one level only
Jeff Hammel <k0scist@gmail.com>
parents: 792
diff changeset
23 helper = cache --timeout=10000
820
737b9eda7f77 [git submodules] logging stub
Jeff Hammel <k0scist@gmail.com>
parents: 818
diff changeset
24 [diff]
737b9eda7f77 [git submodules] logging stub
Jeff Hammel <k0scist@gmail.com>
parents: 818
diff changeset
25 submodule = log
869
ca1fb54c03ee https://coderwall.com/p/7aymfa/please-oh-please-use-git-pull-rebase
Jeff Hammel <k0scist@gmail.com>
parents: 864
diff changeset
26 [branch]
ca1fb54c03ee https://coderwall.com/p/7aymfa/please-oh-please-use-git-pull-rebase
Jeff Hammel <k0scist@gmail.com>
parents: 864
diff changeset
27 autosetuprebase = always
897
ba2630ce851b update default branch for git
Jeff Hammel <k0scist@gmail.com>
parents: 869
diff changeset
28 [init]
ba2630ce851b update default branch for git
Jeff Hammel <k0scist@gmail.com>
parents: 869
diff changeset
29 defaultBranch = main
901
d01703658029 gitconfig
Jeff Hammel <k0scist@gmail.com>
parents: 899
diff changeset
30 [fetch]
d01703658029 gitconfig
Jeff Hammel <k0scist@gmail.com>
parents: 899
diff changeset
31 recurseSubmodules = on-demand
d01703658029 gitconfig
Jeff Hammel <k0scist@gmail.com>
parents: 899
diff changeset
32 [status]
d01703658029 gitconfig
Jeff Hammel <k0scist@gmail.com>
parents: 899
diff changeset
33 submoduleSummary = true
902
06d2cc0fe045 add signing key
Jeff Hammel <k0scist@gmail.com>
parents: 901
diff changeset
34 [gpg]
06d2cc0fe045 add signing key
Jeff Hammel <k0scist@gmail.com>
parents: 901
diff changeset
35 format = ssh
922
74dc16f074be ignore ff merges
Jeff Hammel <k0scist@gmail.com>
parents: 902
diff changeset
36 [merge]
74dc16f074be ignore ff merges
Jeff Hammel <k0scist@gmail.com>
parents: 902
diff changeset
37 ff = no