ficd/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AutoYADM commit: 2025-04-23 02:45:06

Browse source
This commit is contained in:
Daniel Fichtinger 2025-04-23 02:45:06 -04:00
parent abd8998d71
commit a40796b644
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.config/fish/conf.d/bin/git-forgit
View file

@ -849,10 +849,10 @@ _forgit_checkout_branch() {
[[ -z "$branch" ]] && return 1
# track the remote branch if possible
if [[ "$branch" == "remotes/origin/"* ]]; then
if git branch | grep -qw "${branch#remotes/origin/}"; then
if [[ "$branch" == "remotes/"* ]]; then
if git branch | grep -qw "${branch#remotes/*/}"; then
# hack to force creating a new branch which tracks the remote if a local branch already exists
_forgit_git_checkout_branch -b "track/${branch#remotes/origin/}" --track "$branch"
_forgit_git_checkout_branch -b "track/${branch#remotes/*/}" --track "$branch"
elif ! _forgit_git_checkout_branch --track "$branch" 2>/dev/null; then
_forgit_git_checkout_branch "$branch"
fi

2
.config/fish/conf.d/forgit.plugin.fish
View file

@ -39,7 +39,7 @@ if test -z "$FORGIT_NO_ALIASES"
abbr -a -- (string collect $forgit_diff; or string collect "gd") git-forgit diff
abbr -a -- (string collect $forgit_show; or string collect "gso") git-forgit show
abbr -a -- (string collect $forgit_ignore; or string collect "gi") git-forgit ignore
abbr -a -- (string collect $forgit_attributes; or string collect "gi") git-forgit attributes
abbr -a -- (string collect $forgit_attributes; or string collect "gat") git-forgit attributes
abbr -a -- (string collect $forgit_checkout_file; or string collect "gcf") git-forgit checkout_file
abbr -a -- (string collect $forgit_checkout_branch; or string collect "gcb") git-forgit checkout_branch
abbr -a -- (string collect $forgit_branch_delete; or string collect "gbd") git-forgit branch_delete

2
.config/fish/functions/jrnl.fish
View file

@ -15,7 +15,7 @@ function jrnl --description 'Lightweight journaling tool'
echo \t\> set -Ug jrnl_directory path/to/journal
echo \t\> jrnl -d=path
echo \t\> jrnl --dir=path
echo \tSet the template file "(relative to journal directory)":
echo \tSet the template file \n\t"(relative to journal directory, 'template.md' by default)":
echo \t\> set -Ug jrnl_template template_file
echo \t\> jrnl -t=template_file.md
echo \t\> jrnl --template=template_file.md