diff --git a/README.md b/README.md index a937a47..8ec5e5c 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,16 @@ A bar-style prompt showing current time, execution time of the last command | `findbig` | filefct | Find the biggest files in the given or current directory | | `finddead` | filefct | Find dead symbolic links in the given or current directory | | `findzero` | filefct | Find empty files in the given or current directory | +| `gacp` | git | Add, commit and push changes; auto-pulls with rebase first if needed | | `genpwd` | pwd | Generate one or more random secure passwords with configurable constraints | +| `ggraph` | git | Display a decorated git history graph | | `gpid` | processes | Give the list of PIDs matching the given process name(s) | +| `gprune` | git | Delete local branches already merged into the main branch | +| `greset` | git | Reset the current branch to upstream, stashing local changes first | +| `groot` | git | Display the repository root path, or change directory to it with `-g` | +| `gsync` | git | Fetch and rebase the current branch onto its upstream | +| `gst` | git | Display compact git status with branch tracking information | +| `gwip` | git | Create a quick WIP checkpoint commit | | `help` | help | Display the list of available functions and basic usage | | `isipv4` | net | Tell if the given parameter is a valid IPv4 address | | `isipv6` | net | Tell if the given parameter is a valid IPv6 address | @@ -171,6 +179,14 @@ change the default without having to pass flags every time. | `BUSY_DEFAULT_PATTERN` | `[0-9a-f]` | Hex pattern matched by `busy` | | `BUSY_DEFAULT_DELAY` | `0.1` | Polling delay (seconds) for `busy` | +**`[git]`** + +| Key | Default | Description | +|---|---|---| +| `GIT_MAIN_BRANCH` | `main` | Fallback main branch name used when remote HEAD cannot be detected | +| `GIT_DEFAULT_REMOTE` | `origin` | Default remote used by git helper functions | +| `GIT_WIP_PREFIX` | `wip` | Prefix used by `gwip` when generating automatic checkpoint messages | + **`[info]`** | Key | Default | Description | diff --git a/doc/profile.conf.example b/doc/profile.conf.example index bcfb113..ba886b2 100755 --- a/doc/profile.conf.example +++ b/doc/profile.conf.example @@ -76,6 +76,17 @@ TERM=xterm-256color # busy: Delay between matched lines in milliseconds (0 = no delay). #BUSY_DEFAULT_DELAY=0 +# ============================================================================== +[git] +# Fallback main branch name used when remote HEAD cannot be detected. +#GIT_MAIN_BRANCH=main + +# Default remote used by git helper functions. +#GIT_DEFAULT_REMOTE=origin + +# Prefix used by gwip when generating automatic checkpoint messages. +#GIT_WIP_PREFIX=wip + # ============================================================================== [info] # meteo: Default city when no argument is given. Leave unset to require an