Commit graph

87 commits

Author SHA1 Message Date
93e8fe1e3f Add gitattributesdb support. Update bash startup files. Small changes to other files. 2024-08-25 21:20:56 +01:00
5adad9a874 Use a timeout when doing a git merge in the prompt command. 2024-08-23 23:47:01 +01:00
ce8ffa0900 Add file2clip alias for xclip. 2024-08-21 14:23:04 +01:00
eeceeb585e Change --type int to --type bool for a git command. 2023-11-03 23:14:19 +00:00
bc6373332e Handle the .gitconfig-* files in .bashrc. 2023-11-03 21:56:22 +00:00
0733a38e41 Remove use of SANITISED_REPO in .bashrc. Change colour reset value. 2023-10-29 21:17:47 +00:00
b639d4db3c Don't continue prompt if there's no commits. 2023-10-28 23:07:34 +01:00
f0dcdf24f6 Add git auto-merge reporting to prompt command. 2023-10-28 23:05:17 +01:00
2e9a893f28 Run git prefetch as PROMPT_COMMAND. Modify alias handling for Darwin. 2023-10-28 21:53:42 +01:00
a84225d8f3 Clean up .bashrc. 2023-10-25 16:05:55 +01:00
f856dfc18b Remove obsolete GIT_PROMPT_AUTO_PREFETCH option. 2023-10-25 15:25:14 +01:00
fceefe0786 Clean up rev-parse usage. check-ignore uses current dir. 2023-10-20 21:11:53 +01:00
fd099e1458 Save history from this session before reloading it. 2023-10-20 20:30:22 +01:00
3c247cab15 Use SIGKILL for stopping long git jobs. 2023-10-20 20:29:01 +01:00
42ba53f0f8 Do prefetch in any part of repo, not just the root. 2023-10-20 20:23:10 +01:00
9f60a6fde1 Use timeout to limit possibly long running git commands in some repos. 2023-10-20 20:15:03 +01:00
b3cfa2b85f Update way to get branch name in git repo. 2023-10-19 15:43:54 +01:00
fba4a7c40a For git prompt, allow repos to disable prefetch. 2023-10-12 20:30:36 +01:00
12bd327061 Fix branch detection. 2023-10-10 16:25:34 +01:00
76c5592bbf Silence error from unalias nano. 2023-10-10 16:17:07 +01:00
5a79342b87 Typo in .bashrc. 2023-10-10 13:43:09 +01:00
1d4cb9fb19 .bashrc: Re-order git prompt, use local ref for upstream prefetch status. 2023-10-10 13:32:43 +01:00
6514f52d1f Reset GIT_REPO_INFO[6] after prefetch. 2023-10-07 21:45:11 +01:00
c20d90458f Enable GIT_PROMPT_AUTO_PREFETCH. 2023-10-07 21:03:04 +01:00
735e2d504e 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
89417043fc Fix quoting. 2023-10-02 20:52:19 +01:00
1c2393d0b3 Expand use of GIT_REPO_INFO. Foundation work for prefetch support. 2023-10-02 20:40:52 +01:00
7509d2536d Typo in .bashrc. 2023-10-02 18:56:35 +01:00
9bac8a06bd Show an uncommitted marker in the git prompt. 2023-10-02 15:39:28 +01:00
ddf639d0bf Use FD 9 instead of {FD}. Move PLATFORM definition. 2023-10-02 13:50:19 +01:00
3bbc0192dc Use correct stat args and fix FD handling on Darwin. 2023-10-01 23:15:21 +01:00
dff85c6688 Set HISTSIZE to prevent issue on Darwin. 2023-10-01 22:30:09 +01:00
bdc37dd14e Fix PS1 output on Darwin. 2023-10-01 22:18:43 +01:00
9b3d7fecc5 Fix colours in output to use escape codes. 2023-10-01 21:43:43 +01:00
c754664dc8 Use global PLATFORM. Add dynamic .nanorc support. Fix git prompt. 2023-10-01 20:40:46 +01:00
eb1c37ae1c Add credit. 2023-10-01 18:02:07 +01:00
99caf81ebc Remove fixme from .bashrc. 2023-10-01 17:59:05 +01:00
b0af5d148b Use a function to get the colour for the username part of prompt. 2023-10-01 17:57:09 +01:00
538425eeae Add git status information to prompt. 2023-10-01 17:31:19 +01:00
39d61d993d Handle nano on darwin differently. 2023-09-30 15:29:55 +01:00
b196bd7b4f Fucking typo! 2023-09-30 14:46:44 +01:00
a27530bf01 Handle nano versions <= 4 differently. 2023-09-30 14:37:37 +01:00
a97cdb9d10 Sync .bashrc. 2023-09-30 12:15:50 +01:00
e22f53dac0 Query the local terminal for gpg passphrases. 2023-09-29 17:45:48 +01:00
1255f0fff6 Various updates to .bashrc - see full log.
Rework a lot of the ssh agent handling functions.
Use $HOME rather than ~.
Increase history file size to 1m lines.
Use a 3rd colour for the prompt's username if it's != (root|tadgy).
Quote some variables.
Handle .nanorc files on Linux and Darwin.
Refactored some code, nothing major.
2023-09-29 16:33:03 +01:00
dcac32200e Remove shellcheck alias. 2023-08-24 15:04:29 +01:00
6debda37c9 Correct sftp alias and unset _EXEC at end of ssh function. 2023-02-08 19:15:51 +00:00
b1464f4f47 Correct fgrep alias. 2022-10-10 22:35:06 +01:00
90b6565239 Add iotop alias. 2022-10-09 01:59:55 +01:00
6920a2a8f0 Make it clear which agent the message refers to. 2022-09-23 17:40:08 +01:00