tadgy/dotfiles
1
0
Fork 0
Code Releases Wiki Activity Actions

Sync with master.

Browse source
This commit is contained in:
Darren 'Tadgy' Austin 2023-11-03 23:17:17 +00:00
commit 6de2987c41
2 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.bashrc
View file

@ -201,7 +201,7 @@ __git_prompt_command() {
REPO_TIMESTAMP="$(git config --local --get --type int script.AutoMergeLast)" REPO_TIMESTAMP="$(git config --local --get --type int script.AutoMergeLast)"
(( ${!TIMESTAMP_VAR:-0} < REPO_TIMESTAMP )) && { (( ${!TIMESTAMP_VAR:-0} < REPO_TIMESTAMP )) && {
# Display message depending on status. # Display message depending on status.
if [[ "$(git config --local --get --type int script.AutoMergeSuccess)" == "true" ]]; then if [[ "$(git config --local --get --type bool script.AutoMergeSuccess)" == "true" ]]; then
printf "\\033[1;32m%s" "Git auto-merge succeeded for this repo." printf "\\033[1;32m%s" "Git auto-merge succeeded for this repo."
if [[ "${GIT_REPO_INFO[1]}" == "$HOME" ]]; then if [[ "${GIT_REPO_INFO[1]}" == "$HOME" ]]; then
printf " %s\\033[0m\\n" "Re-source .bash* files." printf " %s\\033[0m\\n" "Re-source .bash* files."

29
.gitconfig-tadgy@* Normal file
View file

@ -0,0 +1,29 @@
[user]
name = Darren 'Tadgy' Austin
email = darren@afterdark.org.uk
[color]
branch = auto
diff = auto
grep = auto
interactive = auto
showBranch = auto
status = auto
ui = auto
[credential]
username = tadgy
helper = cache --timeout 2592000
[commit]
verbose = 1
[push]
autoSetupRemote = true
[alias]
c = commit
co = checkout
d = diff
lsut = ls-files --others --exclude-standard --directory --error-unmatch -- ':/*'
p = push
s = status
[init]
defaultBranch = master
[maintenance]
repo = /home/tadgy