-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path_gitconfig
More file actions
32 lines (31 loc) · 903 Bytes
/
Copy path_gitconfig
File metadata and controls
32 lines (31 loc) · 903 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
#
# Modified: 09-Feb-2026 (Bob Heckel)
#
# git config -e # ./.git/config
# git config --global -e # ~/.gitconfig
# git config --global pager.branch false
# git config --global core.pager "less -r"
[core]
pager = less -r -F
[color]
status = auto
diff = auto
[diff]
tool = vimdiff
[merge]
tool = vimdiff
[push]
default = upstream
[user]
email = b.heckel@gmail.com
name = Bob Heckel
[pull]
# "fatal: Not possible to fast-forward, aborting."
# Inspect why the branches diverged. You may discover that you made a
# mistake, like trying to pull master into a local branch. In cases where
# you did intend to create a merge commit, you can now follow with git
# merge. You then perform the "downloading" and the "committing" in two
# different steps, which helps mentally separate these two operations.
#
# To continue: git pull --no-ff origin master && git push
ff = only