Commit graph

373 commits

Author SHA1 Message Date
c74bce5532 Handle the .gitconfig-* files in .bashrc. 2023-11-03 21:56:22 +00:00
fb4ae21e87 Use new colour-changelog filename. 2023-11-03 19:38:17 +00:00
4015999e13 Only forward gpg-agent socket over ssh if it exists. 2023-11-03 19:30:12 +00:00
267df1ce73 Remove use of SANITISED_REPO in .bashrc. Change colour reset value. 2023-10-29 21:17:47 +00:00
04c05f61de Don't continue prompt if there's no commits. 2023-10-28 23:07:34 +01:00
83532d8497 Add git auto-merge reporting to prompt command. 2023-10-28 23:05:17 +01:00
b2744e183e Run git prefetch as PROMPT_COMMAND. Modify alias handling for Darwin. 2023-10-28 21:53:42 +01:00
4bde1a59d8 Fix PATH handling in .bash_profile for Darwin. 2023-10-28 21:53:05 +01:00
6348677876 Clean up .bashrc. 2023-10-25 16:05:55 +01:00
558f4760b9 Remove obsolete GIT_PROMPT_AUTO_PREFETCH option. 2023-10-25 15:25:14 +01:00
db80689044 Clean up rev-parse usage. check-ignore uses current dir. 2023-10-20 21:11:53 +01:00
303b2db0bd Save history from this session before reloading it. 2023-10-20 20:30:22 +01:00
166584a459 Use SIGKILL for stopping long git jobs. 2023-10-20 20:29:01 +01:00
caee9b46d3 Do prefetch in any part of repo, not just the root. 2023-10-20 20:23:10 +01:00
42de61aa61 Use timeout to limit possibly long running git commands in some repos. 2023-10-20 20:15:03 +01:00
4f20dbac29 Update .gitignore files. 2023-10-19 21:20:32 +01:00
c6cc2f3160 Update way to get branch name in git repo. 2023-10-19 15:43:54 +01:00
2b6d51aa5d Add a 'lsut' alias to git. 2023-10-12 22:09:02 +01:00
ef197d6928 .pinerc update. 2023-10-12 22:04:47 +01:00
2f48ff387e Add 'git co' for git checkout alias. 2023-10-12 21:43:40 +01:00
f865ed1048 Update .ssh/config. 2023-10-12 21:41:19 +01:00
6fcb314bef For git prompt, allow repos to disable prefetch. 2023-10-12 20:30:36 +01:00
7df9b8ee53 Add .nanorc-5. 2023-10-12 17:54:06 +01:00
aa5c341adb Ignore .config/libvirt/ directory. 2023-10-10 16:36:11 +01:00
66537fbcde Fix branch detection. 2023-10-10 16:25:34 +01:00
06128ca26d Silence error from unalias nano. 2023-10-10 16:17:07 +01:00
afa147d4d0 Typo in .bashrc. 2023-10-10 13:43:09 +01:00
551bfaa772 .bashrc: Re-order git prompt, use local ref for upstream prefetch status. 2023-10-10 13:32:43 +01:00
635dc5d53b Reset GIT_REPO_INFO[6] after prefetch. 2023-10-07 21:45:11 +01:00
56ecba9df9 Enable GIT_PROMPT_AUTO_PREFETCH. 2023-10-07 21:03:04 +01:00
bce2508550 Update .ssh/config. 2023-10-07 20:43:56 +01:00
5836781dc2 Merge remote-tracking branch 'refs/remotes/origin/master' 2023-10-07 20:38:13 +01:00
5ddf11681d Various updates to __prompt_git_status in .bashrc. See full log.
* Update various comments, include expected arguments and example prompt.
* Use IFS to split GIT_REPO_INFO on \n rather than spaces.
* If the repository has no commits yet, display "!NO COMMITS!" as the branch.
* Use the GIT_REPO_INFO for top-directory instead of another call out to git.
* Use pwd -P to force actual paths not following symlinks.
* Pull upstream status if GIT_PROMPT_AUTO_PREFETCH is set, the current
  directory is the git repo top-dir and maintenance tasks for this repo have
  been enabled.  This allows reporting whether the branch is behind the
  remote by any number.
2023-10-07 20:29:01 +01:00
9e60f3772b Use 'master' as the default branch on git repos. 2023-10-07 20:25:39 +01:00
8537486d9c Merge remote-tracking branch 'refs/remotes/origin/master' 2023-10-05 23:36:16 +01:00
2c6fe78451 Use regular ssh key for github. Remove stale key. 2023-10-05 23:35:45 +01:00
99f9c60973 Merge remote-tracking branch 'refs/remotes/origin/master' 2023-10-05 23:27:15 +01:00
3638f1b81a Update 'safe' directories. Set up git maintenance tasks. 2023-10-05 22:24:55 +01:00
9424108f34 Fix quoting. 2023-10-02 20:52:19 +01:00
f0168a0f69 Expand use of GIT_REPO_INFO. Foundation work for prefetch support. 2023-10-02 20:40:52 +01:00
87799d5870 Cache passwords for 30 days (in memory). 2023-10-02 18:56:56 +01:00
3912d602b4 Typo in .bashrc. 2023-10-02 18:56:35 +01:00
c7dd83b058 Show an uncommitted marker in the git prompt. 2023-10-02 15:39:28 +01:00
e51f4f0d87 Update .gitignores. 2023-10-02 14:41:37 +01:00
3029da7929 Use FD 9 instead of {FD}. Move PLATFORM definition. 2023-10-02 13:50:19 +01:00
4026e54488 Use port 9922 for as.hosts.slackware.network. 2023-10-01 23:34:09 +01:00
147ef88c6f Update .gitignores for Darwin files. 2023-10-01 23:20:21 +01:00
fbf74989f3 Use correct stat args and fix FD handling on Darwin. 2023-10-01 23:15:21 +01:00
3fc8f90360 Don't redefine or unset PLATFORM in .bash_profile. 2023-10-01 22:37:46 +01:00
ac6e509827 Set HISTSIZE to prevent issue on Darwin. 2023-10-01 22:30:09 +01:00