diff -Nru git-extras-6.0.0/AUTHORS git-extras-6.1.0/AUTHORS --- git-extras-6.0.0/AUTHORS 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/AUTHORS 2020-09-26 12:11:50.000000000 +0000 @@ -23,6 +23,7 @@ - Paul Wise - Damien Tardy-Panis - Mark Eissler +- Yuriy VG - Leila Muhtasib - Richard Fearn - Jesús Espino @@ -35,6 +36,7 @@ - Mark Pitman - Luke Childs - Sasha Khamkov +- vyas - Robin Winslow - Yi EungJun - grindhold @@ -66,6 +68,7 @@ - Alexis GRIMALDI - Allan Odgaard - Andre Cerqueira +- Beth Skurrie - Brice Dutheil - Curtis McEnroe - David Rogers @@ -197,6 +200,7 @@ - Steve Mao - Stu Feldt - Timothy Hwang +- Tin Lai - Todd Wolfson - Tom Andrade - Tom Ashworth diff -Nru git-extras-6.0.0/bin/git-archive-file git-extras-6.1.0/bin/git-archive-file --- git-extras-6.0.0/bin/git-archive-file 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-archive-file 2020-09-26 12:11:50.000000000 +0000 @@ -8,20 +8,20 @@ ARCHIVE_NAME=$(basename $(pwd)) if [[ $BRANCH = tags* ]]; then - BRANCH=$(git describe) - echo Building for tag \"$BRANCH\" - FILENAME=$ARCHIVE_NAME.$BRANCH.zip + BRANCH=$(git describe) + echo Building for tag \"$BRANCH\" + FILENAME=$ARCHIVE_NAME.$BRANCH.zip else - echo Building archive on branch \"$BRANCH\" - # get a version string, so archives will not be overwritten when creating - # many of them - VERSION=$(git describe --always --long) - # if not on master append branch name into the filename - if [ "$BRANCH" = "master" ]; then - FILENAME=$ARCHIVE_NAME.$VERSION.zip - else - FILENAME=$ARCHIVE_NAME.$VERSION.$BRANCH.zip - fi + echo Building archive on branch \"$BRANCH\" + # get a version string, so archives will not be overwritten when creating + # many of them + VERSION=$(git describe --always --long) + # if not on master append branch name into the filename + if [ "$BRANCH" = $(git_extra_default_branch) ]; then + FILENAME=$ARCHIVE_NAME.$VERSION.zip + else + FILENAME=$ARCHIVE_NAME.$VERSION.$BRANCH.zip + fi fi # rename invalid chars for the file path diff -Nru git-extras-6.0.0/bin/git-back git-extras-6.1.0/bin/git-back --- git-extras-6.0.0/bin/git-back 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-back 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -echo >&2 "Deprecated. Use 'git undo --soft [commitcount]' instead." - -if test $# -eq 0; then - git reset --soft HEAD~1 -else - if `echo $1 | grep -q [^[:digit:]]`; then - echo "$1 is not a number" 1>&2 - else - git reset --soft HEAD~$1 - fi -fi diff -Nru git-extras-6.0.0/bin/git-browse git-extras-6.1.0/bin/git-browse --- git-extras-6.0.0/bin/git-browse 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-browse 2020-09-26 12:11:50.000000000 +0000 @@ -2,7 +2,8 @@ if [[ $1 == "" ]] then - remote=$(git remote | head -n 1) + branch=$(git rev-parse --abbrev-ref HEAD) + remote=$(git config branch."${branch}".remote || echo "origin") else remote=$1 fi @@ -22,7 +23,7 @@ if [[ $remote_url = git@* ]] then - url=$(echo $remote_url | sed -E -e 's/:/\//' -e 's/\.git$//' -e 's/\w*@(.*)/http:\/\/\1/') + url=$(echo $remote_url | sed -E -e 's/:/\//' -e 's/\.git$//' -e 's/.*@(.*)/http:\/\/\1/') elif [[ $remote_url = http* ]] then url=${remote_url%.git} diff -Nru git-extras-6.0.0/bin/git-bulk git-extras-6.1.0/bin/git-bulk --- git-extras-6.0.0/bin/git-bulk 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-bulk 2020-09-26 12:11:50.000000000 +0000 @@ -61,15 +61,15 @@ if $guardedmode; then echo -n "${inverse}git $gitcommand${reset} -> execute here (y/n)? " read -n 1 -r ${reset} executing ${inverse}git $gitcommand${reset}" && git $gitcommand + echo "${bldred}->${reset} executing ${inverse}git $gitcommand${reset}" && git "$@" } # check if the passed command is known as a core git command @@ -138,7 +138,7 @@ local curdir=$(pwd) local leadingpath=${curdir#${actual}} echo "Current repository: ${leadingpath%/*}/${bldred}${curdir##*/}${reset}" - guardedExecution + guardedExecution "$@" eval cd "\"$rwsdir\"" # back to origin location of last find command done done @@ -184,4 +184,5 @@ addworkspace) allowedargcount 3 5;; esac -$butilcommand # run user command +# pass the origin arguments to the 'executBulkOp' +$butilcommand "$@" # run user command diff -Nru git-extras-6.0.0/bin/git-delete-merged-branches git-extras-6.1.0/bin/git-delete-merged-branches --- git-extras-6.0.0/bin/git-delete-merged-branches 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-delete-merged-branches 2020-09-26 12:11:50.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/env bash -branches=$(git branch --no-color --merged | grep -v "\*" | grep -v master | grep -v svn) +branches=$(git branch --no-color --merged | grep -v "\*" | grep -v $(git_extra_default_branch) | grep -v svn) if [ -n "$branches" ] then echo "$branches" | xargs -n 1 git branch -d diff -Nru git-extras-6.0.0/bin/git-delta git-extras-6.1.0/bin/git-delta --- git-extras-6.0.0/bin/git-delta 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-delta 2020-09-26 12:11:50.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/env bash -branch=master +branch=$(git_extra_default_branch) filter=ACM if test $# -eq 1; then diff -Nru git-extras-6.0.0/bin/git-extras git-extras-6.1.0/bin/git-extras --- git-extras-6.0.0/bin/git-extras 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-extras 2020-09-26 12:11:50.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERSION="6.0.0" +VERSION="6.1.0" INSTALL_SCRIPT="https://raw.githubusercontent.com/tj/git-extras/master/install.sh" update() { diff -Nru git-extras-6.0.0/bin/git-force-clone git-extras-6.1.0/bin/git-force-clone --- git-extras-6.0.0/bin/git-force-clone 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-force-clone 2020-09-26 12:11:50.000000000 +0000 @@ -22,7 +22,7 @@ changed files will be reset, local branches and other remotes will be removed. OPTIONS: - -b, --branch The branch to pull from the remote (default: master) + -b, --branch The branch to pull from the remote -h, --help Display this help message " } diff -Nru git-extras-6.0.0/bin/git-info git-extras-6.1.0/bin/git-info --- git-extras-6.0.0/bin/git-info 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-info 2020-09-26 12:11:50.000000000 +0000 @@ -1,11 +1,40 @@ #!/usr/bin/env bash +GREEN="$(tput setaf 2)" +NORMAL="$(tput sgr0)" +if [ "$1" = "--color" ] || [ "$2" = "--color" ] || \ + [ "$1" = "-c" ] || [ "$2" = "-c" ] ; then + COLOR_TITLE="$GREEN" +else + COLOR_TITLE="$NORMAL" +fi + +HIDE_CONFIG= +if [ "$1" != "--no-config" ] && [ "$2" != "--no-config" ]; then + HIDE_CONFIG=1 +fi + get_config() { - git config --list + cmd_get_config="$(git config --get-all git-extras.info.config-grep)" + if [ -z "$cmd_get_config" ]; then + git config --list + else + eval "$cmd_get_config" + fi } most_recent_commit() { - git log --max-count=1 --pretty=short + cmd_get_log="$(git config --get-all git-extras.info.log)" + if [ -z "$cmd_get_log" ]; then + git log --max-count=1 --pretty=short + else + eval "$cmd_get_log" + fi +} + +submodules() { + # short sha1 + git submodule status | sed 's/\([^abcdef0-9]\{0,2\}\)\([abcdef0-9]\{7\}\)\([abcdef0-9]\{33\}\)\(.*\)/\1\2\4/' } local_branches() { @@ -21,27 +50,30 @@ } echon() { - echo "$@" - echo + echo "$@" + echo } -# Show info similar to svn - echo -echon "## Remote URLs:" +echon "${COLOR_TITLE}## Remote URLs:${NORMAL}" echon "$(remote_urls)" -echon "## Remote Branches:" +echon "${COLOR_TITLE}## Remote Branches:${NORMAL}" echon "$(remote_branches)" -echon "## Local Branches:" +echon "${COLOR_TITLE}## Local Branches:${NORMAL}" echon "$(local_branches)" -echon "## Most Recent Commit:" +SUBMODULES_LOG=$(submodules) +if [ ! -z "$SUBMODULES_LOG" ]; then + echon "${COLOR_TITLE}## Submodule(s):${NORMAL}" + echon "$SUBMODULES_LOG" +fi + +echon "${COLOR_TITLE}## Most Recent Commit:${NORMAL}" echon "$(most_recent_commit)" -echon "Type 'git log' for more commits, or 'git show ' for full commit details." -if test "$1" != "--no-config"; then - echon "## Configuration (.git/config):" +if [ ! -z "$HIDE_CONFIG" ]; then + echon "${COLOR_TITLE}## Configuration (.git/config):${NORMAL}" echon "$(get_config)" fi diff -Nru git-extras-6.0.0/bin/git-pull-request git-extras-6.1.0/bin/git-pull-request --- git-extras-6.0.0/bin/git-pull-request 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-pull-request 2020-09-26 12:11:50.000000000 +0000 @@ -28,15 +28,12 @@ EOF } -# user +# personal access token +# config name is github-personal-access-token '_' is not allowed in git config -user=$(git config user.email) +github_personal_access_token=$(git config git-extras.github-personal-access-token) -if [ -z "$user" ]; then - user="$EMAIL" -fi - -test -z "$user" && abort "git config user.email required" +test -z "$github_personal_access_token" && abort "git config git-extras.github-personal-access-token required" # branch @@ -67,7 +64,7 @@ echo printf " title: " && read -r title printf " body: " && read -r body -printf " base [master]: " && read -r base +printf " base [%s]: " "$(git_extra_default_branch)" && read -r base printf " GitHub two-factor authentication code (leave blank if not set up): " && read -r mfa_code echo @@ -80,7 +77,9 @@ body=$(json "$title" "$body" "$branch" "$base") -curl -u "$user" \ - -H "X-GitHub-OTP: $mfa_code" \ - "https://api.github.com/repos/$project/pulls" -d "$body" - +curl \ + -X POST \ + -H "Accept: application/vnd.github.v3+json" \ + -H "Authorization: token $github_personal_access_token" \ + -H "X-GitHub-OTP: $mfa_code" \ + "https://api.github.com/repos/$project/pulls" -d "$body" \ No newline at end of file diff -Nru git-extras-6.0.0/bin/git-show-merged-branches git-extras-6.1.0/bin/git-show-merged-branches --- git-extras-6.0.0/bin/git-show-merged-branches 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-show-merged-branches 2020-09-26 12:11:50.000000000 +0000 @@ -1,3 +1,3 @@ #!/usr/bin/env bash -git branch --no-color --merged | grep -v "\*" | grep -v master | tr -d ' ' +git branch --no-color --merged | grep -v "\*" | grep -v $(git_extra_default_branch) | tr -d ' ' diff -Nru git-extras-6.0.0/bin/git-show-unmerged-branches git-extras-6.1.0/bin/git-show-unmerged-branches --- git-extras-6.0.0/bin/git-show-unmerged-branches 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-show-unmerged-branches 2020-09-26 12:11:50.000000000 +0000 @@ -1,3 +1,3 @@ #!/usr/bin/env bash -git branch --no-color --no-merged | grep -v "\*" | grep -v master | tr -d ' ' +git branch --no-color --no-merged | grep -v "\*" | grep -v $(git_extra_default_branch) | tr -d ' ' diff -Nru git-extras-6.0.0/bin/git-squash git-extras-6.1.0/bin/git-squash --- git-extras-6.0.0/bin/git-squash 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/bin/git-squash 2020-09-26 12:11:50.000000000 +0000 @@ -43,8 +43,8 @@ fi } -prompt_continuation_if_squashing_master() { - if [[ $src =~ ^master$ ]]; then +prompt_continuation_if_squashing_default_branch() { + if [[ $src == $(git_extra_default_branch) ]]; then read -p "Warning: squashing '$src'! Continue [y/N]? " -r if ! [[ $REPLY =~ ^[Yy]$ ]]; then echo "Exiting" @@ -54,7 +54,7 @@ } squash_branch() { - prompt_continuation_if_squashing_master + prompt_continuation_if_squashing_default_branch if [ -n "$SQUASH_MSG" ]; then base=$(git merge-base "$src" @) msg=$(git log "$base".."$src" --format="%s%n%n%b" --no-merges --reverse) diff -Nru git-extras-6.0.0/Commands.md git-extras-6.1.0/Commands.md --- git-extras-6.0.0/Commands.md 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/Commands.md 2020-09-26 12:11:50.000000000 +0000 @@ -2,7 +2,6 @@ - [`git alias`](#git-alias) - [`git archive-file`](#git-archive-file) - [`git authors`](#git-authors) - - [`git back`](#git-back) - [`git browse`](#git-browse) - [`git bulk`](#git-bulk) - [`git brv`](#git-brv) @@ -750,6 +749,13 @@ myBranch * master + ## Submodule(s): + + a234567 path2submodule1/submodule1 (branch/tag) + + b234567 path2submodule2/submodule2 (branch/tag) + - c234567 path2submodule3/submodule3 (branch/tag) + e234567 path2submodule4/submodule4 (branch/tag) + ## Most Recent Commit: commit e3952df2c172c6f3eb533d8d0b1a6c77250769a7 @@ -757,8 +763,6 @@ Added git-info command. - Type 'git log' for more commits, or 'git show ' for full commit details. - ## Configuration (.git/config): color.diff=auto @@ -950,15 +954,6 @@ Leila Muhtasib ``` -## git back - -Removes the latest commits, and add their changes to your staging area. - -``` -$ git back # Removes the latest commit. -$ git back 3 # Remove the latest 3 commits. -``` - ## git changelog Generates a changelog from git(1) tags (annotated or lightweight) and commit messages. Existing changelog files with filenames that begin with _Change_ or _History_ will be identified automatically with a case insensitive match pattern and existing content will be appended to the new output generated--this behavior can be disabled by specifying the prune option (-p|--prune-old). The generated file will be opened in **$EDITOR** when set. diff -Nru git-extras-6.0.0/CONTRIBUTING.md git-extras-6.1.0/CONTRIBUTING.md --- git-extras-6.0.0/CONTRIBUTING.md 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/CONTRIBUTING.md 2020-09-26 12:11:50.000000000 +0000 @@ -16,6 +16,7 @@ 3. Don't forget to introduce it in `Commands.md`. 4. Update `./etc/git-extras-completion.zsh`. Just follow existing code. 5. (Optional) Update `./etc/bash_completion.sh`. -6. Run `./check_integrity.sh foo` to check if all done. +6. (Optional) Update `./etc/git-extras.fish`. +7. Run `./check_integrity.sh foo` to check if all done. You are welcome to open up an issue to discuss new commands or features before opening a pull request. diff -Nru git-extras-6.0.0/debian/changelog git-extras-6.1.0/debian/changelog --- git-extras-6.0.0/debian/changelog 2020-06-27 11:22:18.000000000 +0000 +++ git-extras-6.1.0/debian/changelog 2020-10-04 20:40:20.000000000 +0000 @@ -1,3 +1,9 @@ +git-extras (6.1.0-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) Sun, 04 Oct 2020 22:40:20 +0200 + git-extras (6.0.0-1) unstable; urgency=medium * New upstream release. diff -Nru git-extras-6.0.0/etc/bash_completion.sh git-extras-6.1.0/etc/bash_completion.sh --- git-extras-6.0.0/etc/bash_completion.sh 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/etc/bash_completion.sh 2020-09-26 12:11:50.000000000 +0000 @@ -143,6 +143,10 @@ __gitcomp "--hard --soft -h -s" } +_git_info(){ + __gitcomp "--color -c --no-config" +} + _git_browse(){ __git_complete_remote_or_refspec } diff -Nru git-extras-6.0.0/etc/git-extras-completion.zsh git-extras-6.1.0/etc/git-extras-completion.zsh --- git-extras-6.0.0/etc/git-extras-completion.zsh 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/etc/git-extras-completion.zsh 2020-09-26 12:11:50.000000000 +0000 @@ -102,6 +102,7 @@ } # subcommands +# new subcommand should be added in alphabetical order _git-authors() { _arguments -C \ '(--list -l)'{--list,-l}'[show authors]' \ @@ -257,13 +258,10 @@ } -_git-ignore() { +_git-info() { _arguments -C \ - '(--append -a)'{--append,-a}'[append .gitignore]' \ - '(--replace -r)'{--replace,-r}'[replace .gitignore]' \ - '(--list-in-table -l)'{--list-in-table,-l}'[print available types in table format]' \ - '(--list-alphabetically -L)'{--list-alphabetically,-L}'[print available types in alphabetical order]' \ - '(--search -s)'{--search,-s}'[search word in available types]' + '(--color -c)'{--color,-c}'[use color for information titles]' \ + '--no-config[do not show list all variables set in config file, along with their values]' } @@ -280,6 +278,18 @@ ':second-branch-name:__gitex_branch_names' } +_git-release() { + _arguments -C \ + '-c[Generates/populates the changelog with all commit message since the last tag.]' \ + '-r[The "remote" repository that is destination of a push operation.]' \ + '-m[use the custom commit information instead of the default message.]' \ + '-s[Create a signed and annotated tag.]' \ + '-u[Create a tag, annotated and signed with the given key.]' \ + '--semver[If the latest tag in your repo matches the semver format requirement, you could increase part of it as the new release tag.]' \ + '--no-empty-commit[Avoid creating empty commit if nothing could be committed.]' \ + '--[The arguments listed after "--" separator will be passed to pre/post-release hook.]' +} + _git-squash() { _arguments '--squash-msg[commit with the squashed commit messages]' _arguments \ @@ -310,18 +320,6 @@ __gitex_commits } -_git-release() { - _arguments -C \ - '-c[Generates/populates the changelog with all commit message since the last tag.]' \ - '-r[The "remote" repository that is destination of a push operation.]' \ - '-m[use the custom commit information instead of the default message.]' \ - '-s[Create a signed and annotated tag.]' \ - '-u[Create a tag, annotated and signed with the given key.]' \ - '--semver[If the latest tag in your repo matches the semver format requirement, you could increase part of it as the new release tag.]' \ - '--no-empty-commit[Avoid creating empty commit if nothing could be committed.]' \ - '--[The arguments listed after "--" separator will be passed to pre/post-release hook.]' -} - _git-undo(){ _arguments -C \ '(--soft -s)'{--soft,-s}'[only rolls back the commit but changes remain un-staged]' \ @@ -334,7 +332,6 @@ alias:'define, search and show aliases' \ archive-file:'export the current head of the git repository to an archive' \ authors:'generate authors report' \ - back:'undo and stage latest commits' \ browse:'open repo website in browser' \ bug:'create bug branch' \ bulk:'run bulk commands' \ diff -Nru git-extras-6.0.0/etc/git-extras.fish git-extras-6.1.0/etc/git-extras.fish --- git-extras-6.0.0/etc/git-extras.fish 1970-01-01 00:00:00.000000000 +0000 +++ git-extras-6.1.0/etc/git-extras.fish 2020-09-26 12:11:50.000000000 +0000 @@ -0,0 +1,182 @@ + +set __fish_git_extras_commands \ + "alias:Define, search and show aliases" \ + "archive-file:Export the current HEAD of the git repository to an archive" \ + "authors:Generate authors report" \ + "browse:View the web page for the current repository" \ + "brv:List branches sorted by their last commit date" \ + "bulk:Run git commands on multiple repositories" \ + "changelog:Generate a changelog report" \ + "clear-soft:Soft clean up a repository" \ + "clear:Rigorously clean up a repository" \ + "coauthor:Add a co-author to the last commit" \ + "commits-since:Show commit logs since some date" \ + "contrib:Show user's contributions" \ + "count:Show commit count" \ + "cp:Copy a file keeping its history" \ + "create-branch:Create branches" \ + "delete-branch:Delete branches" \ + "delete-merged-branches:Delete merged branches" \ + "delete-submodule:Delete submodules" \ + "delete-tag:Delete tags" \ + "delta:Lists changed files" \ + "effort:Show effort statistics on file(s)" \ + "feature:Create/Merge feature branch" \ + "force-clone:overwrite local repositories with clone" \ + "fork:Fork a repo on github" \ + "fresh-branch:Create fresh branches" \ + "gh-pages:Create the GitHub Pages branch" \ + "graft:Merge and destroy a given branch" \ + "guilt:calculate change between two revisions" \ + "ignore-io:Get sample gitignore file" \ + "ignore:Add .gitignore patterns" \ + "info:Returns information on current repository" \ + "local-commits:List local commits" \ + "lock:Lock a file excluded from version control" \ + "locked:ls files that have been locked" \ + "merge-into:Merge one branch into another" \ + "merge-repo:Merge two repo histories" \ + "missing:Show commits missing from another branch" \ + "mr:Checks out a merge request locally" \ + "obliterate:rewrite past commits to remove some files" \ + "paste:Send patches to pastebin for chat conversations" \ + "pr:Checks out a pull request locally" \ + "psykorebase:Rebase a branch with a merge commit" \ + "pull-request:Create pull request for GitHub project" \ + "reauthor:Rewrite history to change author's identity" \ + "rebase-patch:Rebases a patch" \ + "release:Commit, tag and push changes to the repository" \ + "rename-branch:rename local branch and push to remote" \ + "rename-remote:Rename a remote" \ + "rename-tag:Rename a tag" \ + "repl:git read-eval-print-loop" \ + "reset-file:Reset one file" \ + "root:show path of root" \ + "scp:Copy files to SSH compatible git-remote" \ + "sed:replace patterns in git-controlled files" \ + "setup:Set up a git repository" \ + "show-merged-branches:Show merged branches" \ + "show-tree:show branch tree of commit history" \ + "show-unmerged-branches:Show unmerged branches" \ + "squash:Import changes from a branch" \ + "stamp:Stamp the last commit message" \ + "standup:Recall the commit history" \ + "summary:Show repository summary" \ + "sync:Sync local branch with remote branch" \ + "touch:Touch and add file to the index" \ + "undo:Remove latest commits" \ + "unlock:Unlock a file excluded from version control" + +# completion for git-extras itself +complete -c git -f -n '__fish_git_needs_command' -a 'extras' -d 'GIT utilities: repo summary, repl, changelog population, and more' +complete -c git -f -n '__fish_git_using_command extras' -s h -l help -d 'Show the help message, can be used for any git-extras commands' +complete -c git -f -n '__fish_git_using_command extras' -s v -l version -d 'Show git-extras version number' +complete -c git -f -n '__fish_git_using_command extras; and not contains -- update (commandline -opc)' -a "update" -d 'Self update' + +# completion for git-extras provided commands +set __fish_git_extras_commands (printf -- '%s\n' $__fish_git_extras_commands | sed 's/:/\textras:/' | string collect | string escape) +complete -c git -n '__fish_git_needs_command' -a "$__fish_git_extras_commands" +# authors +complete -c git -f -n '__fish_git_using_command authors' -s l -l list -d 'show authors' +complete -c git -f -n '__fish_git_using_command authors' -l no-email -d 'without email' +# bulk +complete -c git -n '__fish_git_using_command bulk' -s a -d 'Run a git command on all workspaces and their repositories' +complete -c git -n '__fish_git_using_command bulk' -s g -d 'Ask the user for confirmation on every execution' +complete -c git -x -n '__fish_git_using_command bulk' -s w -d 'Run on specified workspace' +complete -c git -x -n '__fish_git_using_command bulk' -l addworkspace -d 'Register a workspace for builk operations' +complete -c git -x -n '__fish_git_using_command bulk; and contains addworkspace (commandline -opc)' -l addworkspace -d 'the URL or file with URLs to be added' +complete -c git -x -n '__fish_git_using_command bulk' -l removeworkspace -d 'Remove the workspace with the logical name ' +complete -c git -x -n '__fish_git_using_command bulk' -l addcurrent -d 'Add the current directory as a workspace' +complete -c git -x -n '__fish_git_using_command bulk' -l purge -d 'Removes all defined repository locations' +complete -c git -x -n '__fish_git_using_command bulk' -l listall -d 'List all registered repositories' +# changelog +complete -c git -f -n '__fish_git_using_command changelog' -s a -l all -d 'Retrieve all commits' +complete -c git -f -n '__fish_git_using_command changelog' -s l -l list -d 'Show commits in list format (without titles, dates)' +complete -c git -f -n '__fish_git_using_command changelog' -s t -l tag -d 'Specify a tag label to use for most-recent (untagged) commits' +complete -c git -f -n '__fish_git_using_command changelog' -s f -l final-tag -d 'When specifying a range, the newest tag at which point commit retrieval will end' +complete -c git -f -n '__fish_git_using_command changelog' -s s -l start-tag -d 'When specifying a range, the oldest tag to retrieve commits from' +complete -c git -f -n '__fish_git_using_command changelog' -l start-commit -d 'Like the --start-tag but specify the oldest commit instead of tag' +complete -c git -f -n '__fish_git_using_command changelog' -s n -l no-merges -d 'Filters out merge commits (commits with more than 1 parent) from generated changelog' +complete -c git -f -n '__fish_git_using_command changelog' -s m -l merges-only -d 'Uses only merge commits (commits with more than 1 parent) for generated changelog' +complete -c git -f -n '__fish_git_using_command changelog' -s p -l prune-old -d 'Replace existing changelog entirely with newly generated content' +complete -c git -f -n '__fish_git_using_command changelog' -s x -l stdout -d 'Write output to stdout instead of to a new changelog file' +# count +complete -c git -f -n '__fish_git_using_command count' -l all -d 'detailed commit count' +# create-branch +complete -c git -x -n '__fish_git_using_command create-branch' -s r -l remote -a '(__fish_git_unique_remote_branches)' -d 'setup remote tracking branch' +# delete-branch +complete -c git -x -n '__fish_git_using_command delete-branch' -a '(__fish_git_branches)' -d 'branch to delete' +# delete-submodule +complete -c git -x -n "__fish_git_using_command delete-submodule" -a "(__fish_git submodule status 2>/dev/null | string trim | cut -d ' ' -f 2)" -d 'submodule to delete' +# delete-tag +complete -c git -x -n "__fish_git_using_command delete-tag" -a '(__fish_git for-each-ref --format="%(refname)" refs/tags 2>/dev/null)' -d 'tag to delete' +# effort +complete -c git -f -n '__fish_git_using_command effort' -l above -d 'ignore file with less than x commits' +# feature +complete -c git -x -n '__fish_git_using_command feature' -s a -l alias -d 'use branch_prefix instead of feature' +complete -c git -f -n '__fish_git_using_command feature; and not contains -- finish (commandline -opc)' -a "finish" -d 'merge and delete the feature branch' +complete -c git -f -n '__fish_git_using_command feature; and contains -- finish (commandline -opc)' -l squash -d 'Run a squash merge' +complete -c git -x -n '__fish_git_using_command feature; and contains -- finish (commandline -opc)' -a '(__fish_git for-each-ref --format="%(refname)" 2>/dev/null | grep "refs/heads/feature")' -d 'name of feature branch' +complete -c git -x -n '__fish_git_using_command feature; and not contains -- finish (commandline -opc)' -s r -l remote -a '(__fish_git_unique_remote_branches)' -d 'Setup a remote tracking branch' +# graft +complete -c git -x -n '__fish_git_using_command graft' -s r -l remote -a '(__fish_git_branches)' -d 'src-branch-name' +complete -c git -x -n '__fish_git_using_command graft' -s r -l remote -a '(__fish_git_branches)' -d 'dest-branch-name' +# guilt +complete -c git -f -n '__fish_git_using_command guilt' -s w -l ignore-whitespace -d 'ignore whitespace only changes' +complete -c git -f -n '__fish_git_using_command guilt' -s e -l email -d 'display author emails instead of names' +complete -c git -f -n '__fish_git_using_command guilt' -s d -l debug -d 'output debug information' +complete -c git -f -n '__fish_git_using_command guilt' -s h -d 'output usage information' +# ignore +complete -c git -f -n '__fish_git_using_command ignore' -s l -l local -d 'show local gitignore' +complete -c git -f -n '__fish_git_using_command ignore' -s g -l global -d 'show global gitignore' +complete -c git -f -n '__fish_git_using_command ignore' -s p -l private -d 'show repo gitignore' +# ignore-io +function __fish_git_extra_get_ignore_io_types + # we will first remove every tab spaces, and then append `\t` at the end to remove the default description + git ignore-io -l | string replace -r --all -- "\t+" "\n" | string replace -r -- "\$" "\t" +end +complete -c git -x -n '__fish_git_using_command ignore-io' -a '(__fish_git_extra_get_ignore_io_types)' +complete -c git -x -n '__fish_git_using_command ignore-io' -s a -l append -a '(__fish_git_extra_get_ignore_io_types)' -d 'append .gitignore' +complete -c git -x -n '__fish_git_using_command ignore-io' -s r -l replace -a '(__fish_git_extra_get_ignore_io_types)' -d 'replace .gitignore' +complete -c git -x -n '__fish_git_using_command ignore-io' -s l -l list-in-table -d 'print available types in table format' +complete -c git -x -n '__fish_git_using_command ignore-io' -s L -l list-alphabetically -d 'print available types in alphabetical order' +complete -c git -x -n '__fish_git_using_command ignore-io' -s s -l search -d 'search word in available types' +complete -c git -x -n '__fish_git_using_command ignore-io' -s t -l show-update-time -d 'Show the last modified time of ~/.gi_list' +complete -c git -x -n '__fish_git_using_command ignore-io' -s u -l update -d 'Update ~/.gi_list' +# merge-into +complete -c git -n '__fish_git_using_command merge-into' -l ff-only -d 'merge only fast-forward' +complete -c git -x -n '__fish_git_using_command merge-into' -a '(__fish_git_branches)' +# missing +complete -c git -x -n '__fish_git_using_command missing' -a '(__fish_git_branches)' +# squash +complete -c git -x -n '__fish_git_using_command squash' -a '(__fish_git_branches)' +complete -c git -x -n '__fish_git_using_command squash' -l squash-msg -d 'commit with the squashed commit messages' +# stamp +complete -c git -x -n '__fish_git_using_command stamp' -s r -l replace -d 'replace stamps with same id' +# standup +complete -c git -x -n '__fish_git_using_command standup' -s a -d 'Specify the author of commits. Use "all" to specify all authors' +complete -c git -x -n '__fish_git_using_command standup' -s m -d 'The depth of recursive directory search' +complete -c git -x -n '__fish_git_using_command standup' -s d -d 'Show history since N days ago' +complete -c git -x -n '__fish_git_using_command standup' -s D -d 'Specify the date format displayed in commit history' +complete -c git -n '__fish_git_using_command standup' -s f -d 'Fetch commits before showing history' +complete -c git -n '__fish_git_using_command standup' -s g -d 'Display GPG signed info' +complete -c git -n '__fish_git_using_command standup' -s h -l help -d 'Display help message' +complete -c git -n '__fish_git_using_command standup' -s L -d 'Enable the inclusion of symbolic links' +complete -c git -n '__fish_git_using_command standup' -s B -d 'Display the commits in branch group' +complete -c git -x -n '__fish_git_using_command standup' -s n -d 'Limit the number of commits displayed per group' +# summary +complete -c git -n '__fish_git_using_command summary' -l line -d 'summarize with lines rather than commits' +complete -c git -n '__fish_git_using_command summary' -l dedup-by-email -d 'remove duplicate users by the email address' +# release +complete -c git -x -n '__fish_git_using_command release' -s c -d 'Generates/populates the changelog with all commit message since the last tag' +complete -c git -x -n '__fish_git_using_command release' -s r -d 'The "remote" repository that is destination of a push operation' +complete -c git -x -n '__fish_git_using_command release' -s m -d 'use the custom commit information instead of the default message' +complete -c git -x -n '__fish_git_using_command release' -s s -d 'Create a signed and annotated tag' +complete -c git -x -n '__fish_git_using_command release' -s u -d 'Create a tag, annotated and signed with the given key' +complete -c git -x -n '__fish_git_using_command release' -l semver -d 'If the latest tag matches semver format, increase part of it as the new release tag' +complete -c git -x -n '__fish_git_using_command release' -l no-empty-commit -d 'Avoid creating empty commit if nothing could be committed' +# undo +complete -c git -x -n '__fish_git_using_command undo' -s s -l soft -d 'only rolls back the commit but changes remain un-staged' +complete -c git -x -n '__fish_git_using_command undo' -s h -l hard -d 'wipes your commit(s)' + + diff -Nru git-extras-6.0.0/helper/git-extra-utility git-extras-6.1.0/helper/git-extra-utility --- git-extras-6.0.0/helper/git-extra-utility 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/helper/git-extra-utility 2020-09-26 12:11:50.000000000 +0000 @@ -5,3 +5,12 @@ mktemp -t "$(basename "$0")".XXXXXXX } +git_extra_default_branch() { + local default_branch + default_branch=$(git config --get git-extras.default-branch) + if [ -z "$default_branch" ]; then + echo "master" + else + echo "$default_branch" + fi +} diff -Nru git-extras-6.0.0/History.md git-extras-6.1.0/History.md --- git-extras-6.0.0/History.md 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/History.md 2020-09-26 12:11:50.000000000 +0000 @@ -1,4 +1,50 @@ +6.1.0 / 2020-09-26 +================== + + * Merge pull request #878 from spacewander/default_br + * Merge pull request #880 from spacewander/fix_bsd_sed_regex + * git-info: fix regex for bsd sed + * Merge pull request #879 from spacewander/pass_arg + * feat: pass origin argument down to git execution + * change: migrate default branch + * Merge pull request #872 from yuravg/pr_typo + * doc: fix typo + * Merge pull request #869 from spacewander/typo + * git-back: removed + * fix typo + * Merge pull request #868 from spacewander/zsh_completion + * sort completion in alphabetical order + * remove incorrect completion + * git-info: add zsh completion + * Merge pull request #867 from yuravg/pr2source + * doc: fix argument description + * git-info: moved argument checking + * git-info: fix namespace + * doc: update derived git-info files + * doc: add description for git-info + * Add bash completion for git-info + * git-info: colorized headers + * git-info: extend configuration and commit information + * git-info: remove notes about git-log, git-show + * git-info: add info about submodules + * git-info: fix indentation, remove comment + * Merge pull request #864 from v-y-a-s/pr + * Grammar correction + * Remove $user + * corrections + * Update doc + * fix config message name + * Remove comments + * PR test + * Merge pull request #860 from soraxas/implement-fish-completions + * implement fish completions file + * Merge pull request #853 from bethesque/feat/git-browse-with-multiple-remotes + * feat(browse): automatically select origin remote if one exists, fallback to first otherwise + * Merge pull request #854 from bethesque/fix/git-browse-sed-on-mac + * fix(browse): update sed pattern to work on mac + * Bump version to 6.1.0-dev + 6.0.0 / 2020-06-22 ================== diff -Nru git-extras-6.0.0/Makefile git-extras-6.1.0/Makefile --- git-extras-6.0.0/Makefile 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/Makefile 2020-09-26 12:11:50.000000000 +0000 @@ -74,6 +74,8 @@ @echo "" @echo "If you are a zsh user, you may want to 'source $(CODE_DIR)etc/git-extras-completion.zsh'" \ "and put this line into ~/.zshrc to enable zsh completion" + @echo "If you are a fish user, you may want to copy or link '$(CODE_DIR)etc/git-extras.fish'" \ + "to '~/.config/fish/completions/'" man/index.txt: $(MANS) echo '# manuals' > $@.tmp diff -Nru git-extras-6.0.0/man/git-back.1 git-extras-6.1.0/man/git-back.1 --- git-extras-6.0.0/man/git-back.1 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-back.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -.\" generated with Ronn/v0.7.3 -.\" http://github.com/rtomayko/ronn/tree/0.7.3 -. -.TH "GIT\-BACK" "1" "February 2020" "" "Git Extras" -. -.SH "NAME" -\fBgit\-back\fR \- Undo and Stage latest commits -. -.SH "SYNOPSIS" -\fBgit\-back\fR [] -. -.SH "DESCRIPTION" -Deprecated\. Use \'git undo \-\-soft [commitcount]\' instead\. -. -.P -Removes the latest commits, and add their changes to your staging area\. -. -.SH "OPTIONS" - -. -.P -Number of commits to remove\. Defaults to \fI1\fR, thus remove the latest commit\. -. -.SH "EXAMPLES" -Removes the latest commit\. -. -.IP "" 4 -. -.nf - -$ git back -. -.fi -. -.IP "" 0 -. -.P -Remove the latest 3 commits: -. -.IP "" 4 -. -.nf - -$ git back 3 -. -.fi -. -.IP "" 0 -. -.SH "AUTHOR" -Written by Kenneth Reitz <\fIme@kennethreitz\.com\fR> -. -.SH "REPORTING BUGS" -<\fIhttps://github\.com/tj/git\-extras/issues\fR> -. -.SH "SEE ALSO" -<\fIhttps://github\.com/tj/git\-extras\fR> diff -Nru git-extras-6.0.0/man/git-back.html git-extras-6.1.0/man/git-back.html --- git-extras-6.0.0/man/git-back.html 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-back.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,126 +0,0 @@ - - - - - - git-back(1) - Undo and Stage latest commits - - - - -
- - - -
    -
  1. git-back(1)
    2. -
  2. Git Extras
    3. -
  3. git-back(1)
    4. -
- -

NAME

-

- git-back - Undo and Stage latest commits -

- -

SYNOPSIS

- -

git-back [<commitcount>]

- -

DESCRIPTION

- -

Deprecated. Use 'git undo --soft [commitcount]' instead.

- -

Removes the latest commits, and add their changes to your staging area.

- -

OPTIONS

- -

<commitcount>

- -

Number of commits to remove. Defaults to 1, thus remove the latest commit.

- -

EXAMPLES

- -

Removes the latest commit.

- -
$ git back
-
- -

Remove the latest 3 commits:

- -
$ git back 3
-
- -

AUTHOR

- -

Written by Kenneth Reitz <me@kennethreitz.com>

- -

REPORTING BUGS

- -

<https://github.com/tj/git-extras/issues>

- -

SEE ALSO

- -

<https://github.com/tj/git-extras>

- - -
    -
  1. -
  2. February 2020
    3. -
  3. git-back(1)
    4. -
- -
- - diff -Nru git-extras-6.0.0/man/git-back.md git-extras-6.1.0/man/git-back.md --- git-extras-6.0.0/man/git-back.md 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-back.md 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -git-back(1) -- Undo and Stage latest commits -============================================ - -## SYNOPSIS - -`git-back` [<commitcount>] - -## DESCRIPTION - - Deprecated. Use 'git undo --soft [commitcount]' instead. - - Removes the latest commits, and add their changes to your staging area. - -## OPTIONS - - <commitcount> - - Number of commits to remove. Defaults to *1*, thus remove the latest commit. - -## EXAMPLES - - Removes the latest commit. - - $ git back - - Remove the latest 3 commits: - - $ git back 3 - -## AUTHOR - -Written by Kenneth Reitz <> - -## REPORTING BUGS - -<> - -## SEE ALSO - -<> diff -Nru git-extras-6.0.0/man/git-bulk.1 git-extras-6.1.0/man/git-bulk.1 --- git-extras-6.0.0/man/git-bulk.1 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-bulk.1 2020-09-26 12:11:50.000000000 +0000 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-BULK" "1" "December 2019" "" "Git Extras" +.TH "GIT\-BULK" "1" "August 2020" "" "Git Extras" . .SH "NAME" \fBgit\-bulk\fR \- Run git commands on multiple repositories @@ -69,7 +69,7 @@ Register a workspace for bulk operations\. All repositories in the directories below get registered under this workspace with the name \. must be absolute path\. . .P -With option \'\-\-from\' the URL to a single repository or a file containing multiple URLs can be added and they will be cloned diretly into the workspace\. Suitable for the initial setup of a multi\-repo project\. +With option \'\-\-from\' the URL to a single repository or a file containing multiple URLs can be added and they will be cloned directly into the workspace\. Suitable for the initial setup of a multi\-repo project\. . .P \-\-removeworkspace diff -Nru git-extras-6.0.0/man/git-bulk.html git-extras-6.1.0/man/git-bulk.html --- git-extras-6.0.0/man/git-bulk.html 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-bulk.html 2020-09-26 12:11:50.000000000 +0000 @@ -116,7 +116,7 @@

Register a workspace for bulk operations. All repositories in the directories below <ws-root-directory> get registered under this workspace with the name <ws-name>. <ws-root-directory> must be absolute path.

-

With option '--from' the URL to a single repository or a file containing multiple URLs can be added and they will be cloned diretly into the workspace. Suitable for the initial setup of a multi-repo project.

+

With option '--from' the URL to a single repository or a file containing multiple URLs can be added and they will be cloned directly into the workspace. Suitable for the initial setup of a multi-repo project.

--removeworkspace <ws-name>

@@ -183,7 +183,7 @@

AUTHOR

-

Written by Niklas Schlimm <ns103@hotmail.de>

+

Written by Niklas Schlimm <ns103@hotmail.de>

REPORTING BUGS

@@ -196,7 +196,7 @@
  1. -
  2. December 2019
    3. +
  3. August 2020
  4. git-bulk(1)
diff -Nru git-extras-6.0.0/man/git-bulk.md git-extras-6.1.0/man/git-bulk.md --- git-extras-6.0.0/man/git-bulk.md 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-bulk.md 2020-09-26 12:11:50.000000000 +0000 @@ -40,7 +40,7 @@ Register a workspace for bulk operations. All repositories in the directories below <ws-root-directory> get registered under this workspace with the name <ws-name>. <ws-root-directory> must be absolute path. - With option '--from' the URL to a single repository or a file containing multiple URLs can be added and they will be cloned diretly into the workspace. Suitable for the initial setup of a multi-repo project. + With option '--from' the URL to a single repository or a file containing multiple URLs can be added and they will be cloned directly into the workspace. Suitable for the initial setup of a multi-repo project. --removeworkspace <ws-name> diff -Nru git-extras-6.0.0/man/git-extras.1 git-extras-6.1.0/man/git-extras.1 --- git-extras-6.0.0/man/git-extras.1 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-extras.1 2020-09-26 12:11:50.000000000 +0000 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-EXTRAS" "1" "May 2020" "" "Git Extras" +.TH "GIT\-EXTRAS" "1" "September 2020" "" "Git Extras" . .SH "NAME" \fBgit\-extras\fR \- Awesome GIT utilities @@ -27,6 +27,12 @@ .P Self update\. . +.SH "ENVIRONMENT AND CONFIGURATION VARIABLES" +\fBgit config \-\-add git\-extras\.default\-branch $BRANCH\fR +. +.P +Change the default branch to \fB$BRANCH\fR (defaut to \fBmaster\fR)\. +. .SH "COMMANDS" . .IP "\(bu" 4 @@ -39,9 +45,6 @@ \fBgit\-authors(1)\fR Generate authors report . .IP "\(bu" 4 -\fBgit\-back(1)\fR Undo and Stage latest commits -. -.IP "\(bu" 4 \fBgit\-browse(1)\fR \fIView the web page for the current repository\fR . .IP "\(bu" 4 diff -Nru git-extras-6.0.0/man/git-extras.html git-extras-6.1.0/man/git-extras.html --- git-extras-6.0.0/man/git-extras.html 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-extras.html 2020-09-26 12:11:50.000000000 +0000 @@ -56,6 +56,7 @@ NAME SYNOPSIS OPTIONS + ENVIRONMENT AND CONFIGURATION VARIABLES COMMANDS AUTHOR REPORTING BUGS @@ -91,13 +92,18 @@

Self update.

+

ENVIRONMENT AND CONFIGURATION VARIABLES

+ +

git config --add git-extras.default-branch $BRANCH

+ +

Change the default branch to $BRANCH (defaut to master).

+

COMMANDS

  • git-alias(1) Define, search and show aliases
  • git-archive-file(1) Export the current HEAD of the git repository to an archive
  • git-authors(1) Generate authors report
    • -
  • git-back(1) Undo and Stage latest commits
  • git-browse(1) View the web page for the current repository
  • git-brv(1) List branches sorted by their last commit date
  • git-bulk(1) Run git commands on multiple repositories
    • @@ -166,7 +172,7 @@

    AUTHOR

    -

    Written by Tj Holowaychuk <tj@vision-media.ca>

    +

    Written by Tj Holowaychuk <tj@vision-media.ca>

    REPORTING BUGS

    @@ -179,7 +185,7 @@
    1. -
    2. May 2020
      3. +
    3. September 2020
    4. git-extras(1)
    diff -Nru git-extras-6.0.0/man/git-extras.md git-extras-6.1.0/man/git-extras.md --- git-extras-6.0.0/man/git-extras.md 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-extras.md 2020-09-26 12:11:50.000000000 +0000 @@ -19,12 +19,17 @@ Self update. +## ENVIRONMENT AND CONFIGURATION VARIABLES + + `git config --add git-extras.default-branch $BRANCH` + + Change the default branch to `$BRANCH` (defaut to `master`). + ## COMMANDS - **git-alias(1)** Define, search and show aliases - **git-archive-file(1)** Export the current HEAD of the git repository to an archive - **git-authors(1)** Generate authors report - - **git-back(1)** Undo and Stage latest commits - **git-browse(1)** - **git-brv(1)** List branches sorted by their last commit date - **git-bulk(1)** Run git commands on multiple repositories diff -Nru git-extras-6.0.0/man/git-info.1 git-extras-6.1.0/man/git-info.1 --- git-extras-6.0.0/man/git-info.1 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-info.1 2020-09-26 12:11:50.000000000 +0000 @@ -1,13 +1,13 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-INFO" "1" "October 2017" "" "Git Extras" +.TH "GIT\-INFO" "1" "August 2020" "" "Git Extras" . .SH "NAME" \fBgit\-info\fR \- Returns information on current repository . .SH "SYNOPSIS" -\fBgit\-info\fR +\fBgit\-info\fR [\-c|\-\-color] [\-\-no\-config] . .SH "DESCRIPTION" Shows the following information about a repository: @@ -22,15 +22,85 @@ Local Branches . .IP "4." 4 -Most recent commit +Submodule(s) (if present) . .IP "5." 4 +Most recent commit +. +.IP "6." 4 Configuration Info . .IP "" 0 . .SH "OPTIONS" -N/A +\-c, \-\-color +. +.P +Use color for information titles\. +. +.P +\-\-no\-config +. +.P +Don\'t show list all variables set in config file, along with their values\. +. +.SH "GIT CONFIGS" +You could customize the Most recent commit and Configuration Info format via git config options +. +.IP "" 4 +. +.nf + +$ git config \-\-global \-\-add git\-extras\.info\.log "" +. +.fi +. +.IP "" 0 +. +.P +the default \fIlog\-command\fR is "git log \-\-max\-count=1 \-\-pretty=short" +. +.IP "" 4 +. +.nf + +$ git config \-\-global \-\-add git\-extras\.info\.config\-grep "" +. +.fi +. +.IP "" 0 +. +.P +the default \fIconfig\-grep\-command\fR is "git config \-\-list" +. +.P +For example, +. +.P +to set global configuration to show last commit subject, without sha1 +. +.IP "" 4 +. +.nf + + $ git config \-\-global \-\-add git\-extras\.info\.log "git log \-\-max\-count=1 \-\-format=\e"Author: %an%nDate: %ad (%ar)%n%n %s\e" \-\-date=format:\e"%Y\-%m\-%d %a %H:%M\e"" +. +.fi +. +.IP "" 0 +. +.P +to set global configuration to show user\'s name and email +. +.IP "" 4 +. +.nf + + $ git config \-\-global \-\-add git\-extras\.info\.config\-grep "git config \-\-list | grep \-\-color=never \-E \e"^user\.name|^user\.email\e"" +. +.fi +. +.IP "" 0 . .SH "EXAMPLES" Outputs info about a repo: @@ -56,6 +126,13 @@ myBranch * master +## Submodule(s): + + a234567 path2submodule1/submodule1 (branch/tag) ++ b234567 path2submodule2/submodule2 (branch/tag) +\- c234567 path2submodule3/submodule3 (branch/tag) + e234567 path2submodule4/submodule4 (branch/tag) + ## Most Recent Commit: commit e3952df2c172c6f3eb533d8d0b1a6c77250769a7 @@ -63,8 +140,6 @@ Added git\-info command\. -Type \'git log\' for more commits, or \'git show \' for full commit details\. - ## Configuration (\.git/config): color\.diff=auto diff -Nru git-extras-6.0.0/man/git-info.html git-extras-6.1.0/man/git-info.html --- git-extras-6.0.0/man/git-info.html 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-info.html 2020-09-26 12:11:50.000000000 +0000 @@ -57,6 +57,7 @@ SYNOPSIS DESCRIPTION OPTIONS + GIT CONFIGS EXAMPLES AUTHOR REPORTING BUGS @@ -76,7 +77,7 @@

    SYNOPSIS

    -

    git-info

    +

    git-info [-c|--color] [--no-config]

    DESCRIPTION

    @@ -86,6 +87,7 @@
  • Remote Url(s)
  • Remote Branches
  • Local Branches
    • +
  • Submodule(s) (if present)
  • Most recent commit
  • Configuration Info
    • @@ -93,7 +95,39 @@

    OPTIONS

    -

    N/A

    +

    -c, --color

    + +

    Use color for information titles.

    + +

    --no-config

    + +

    Don't show list all variables set in config file, along with their values.

    + +

    GIT CONFIGS

    + +

    You could customize the Most recent commit and Configuration Info format via git config options

    + +
    $ git config --global --add git-extras.info.log "<log-command>"
+
    + +

    the default log-command is "git log --max-count=1 --pretty=short"

    + +
    $ git config --global --add git-extras.info.config-grep "<config-grep-command>"
+
    + +

    the default config-grep-command is "git config --list"

    + +

    For example,

    + +

    to set global configuration to show last commit subject, without sha1

    + +
     $ git config --global --add git-extras.info.log "git log --max-count=1 --format=\"Author: %an%nDate:   %ad (%ar)%n%n    %s\" --date=format:\"%Y-%m-%d %a %H:%M\""
+
    + +

    to set global configuration to show user's name and email

    + +
     $ git config --global --add git-extras.info.config-grep "git config --list | grep --color=never -E \"^user.name|^user.email\""
+

    EXAMPLES

    @@ -116,6 +150,13 @@ myBranch * master +## Submodule(s): + + a234567 path2submodule1/submodule1 (branch/tag) ++ b234567 path2submodule2/submodule2 (branch/tag) +- c234567 path2submodule3/submodule3 (branch/tag) + e234567 path2submodule4/submodule4 (branch/tag) + ## Most Recent Commit: commit e3952df2c172c6f3eb533d8d0b1a6c77250769a7 @@ -123,8 +164,6 @@ Added git-info command. -Type 'git log' for more commits, or 'git show <commit id>' for full commit details. - ## Configuration (.git/config): color.diff=auto @@ -145,7 +184,7 @@

    AUTHOR

    -

    Written by Leila Muhtasib <muhtasib@gmail.com>

    +

    Written by Leila Muhtasib <muhtasib@gmail.com>

    REPORTING BUGS

    @@ -158,7 +197,7 @@
    1. -
    2. October 2017
      3. +
    3. August 2020
    4. git-info(1)
    diff -Nru git-extras-6.0.0/man/git-info.md git-extras-6.1.0/man/git-info.md --- git-extras-6.0.0/man/git-info.md 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-info.md 2020-09-26 12:11:50.000000000 +0000 @@ -3,7 +3,7 @@ ## SYNOPSIS -`git-info` +`git-info` [-c|--color] [--no-config] ## DESCRIPTION @@ -12,12 +12,41 @@ 1. Remote Url(s) 2. Remote Branches 3. Local Branches - 4. Most recent commit - 5. Configuration Info + 4. Submodule(s) (if present) + 5. Most recent commit + 6. Configuration Info ## OPTIONS -N/A + -c, --color + + Use color for information titles. + + --no-config + + Don't show list all variables set in config file, along with their values. + +## GIT CONFIGS + + You could customize the Most recent commit and Configuration Info format via git config options + + $ git config --global --add git-extras.info.log "" + + the default is "git log --max-count=1 --pretty=short" + + $ git config --global --add git-extras.info.config-grep "" + + the default is "git config --list" + + For example, + + to set global configuration to show last commit subject, without sha1 + + $ git config --global --add git-extras.info.log "git log --max-count=1 --format=\"Author: %an%nDate: %ad (%ar)%n%n %s\" --date=format:\"%Y-%m-%d %a %H:%M\"" + + to set global configuration to show user's name and email + + $ git config --global --add git-extras.info.config-grep "git config --list | grep --color=never -E \"^user.name|^user.email\"" ## EXAMPLES @@ -40,6 +69,13 @@ myBranch * master + ## Submodule(s): + + a234567 path2submodule1/submodule1 (branch/tag) + + b234567 path2submodule2/submodule2 (branch/tag) + - c234567 path2submodule3/submodule3 (branch/tag) + e234567 path2submodule4/submodule4 (branch/tag) + ## Most Recent Commit: commit e3952df2c172c6f3eb533d8d0b1a6c77250769a7 @@ -47,8 +83,6 @@ Added git-info command. - Type 'git log' for more commits, or 'git show ' for full commit details. - ## Configuration (.git/config): color.diff=auto diff -Nru git-extras-6.0.0/man/git-pr.1 git-extras-6.1.0/man/git-pr.1 --- git-extras-6.0.0/man/git-pr.1 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-pr.1 2020-09-26 12:11:50.000000000 +0000 @@ -1,16 +1,22 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-PR" "1" "August 2019" "" "Git Extras" +.TH "GIT\-PR" "1" "September 2020" "" "Git Extras" . .SH "NAME" \fBgit\-pr\fR \- Checks out a pull request locally . .SH "SYNOPSIS" -\fBgit\-pr\fR[\-m|\-\-merge] [] +\fBgit\-pr\fR [\-m|\-\-merge] [] . .br -\fBgit\-pr [\-m|\-\-merge] <[remote]:number>\.\.\.
    \fRgit\-pr\fB[\-m|\-\-merge] <url>\.\.\.
    \fRgit\-pr clean` +\fBgit\-pr\fR [\-m|\-\-merge] <[remote]:number>\.\.\. +. +.br +\fBgit\-pr\fR [\-m|\-\-merge] \.\.\. +. +.br +\fBgit\-pr clean\fR . .SH "DESCRIPTION" Creates a local branch based on a GitHub pull request number or URL, and switch to that branch afterwards\. diff -Nru git-extras-6.0.0/man/git-pr.html git-extras-6.1.0/man/git-pr.html --- git-extras-6.0.0/man/git-pr.html 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-pr.html 2020-09-26 12:11:50.000000000 +0000 @@ -76,10 +76,10 @@

    SYNOPSIS

    -

    git-pr[-m|--merge] <number> [<remote>]
    -git-pr [-m|--merge] &lt;[remote]:number&gt;...<br> -git-pr[-m|--merge] &lt;url&gt;...<br> -git-pr clean`

    +

    git-pr [-m|--merge] <number> [<remote>]
    +git-pr [-m|--merge] <[remote]:number>...
    +git-pr [-m|--merge] <url>...
    +git-pr clean

    DESCRIPTION

    @@ -194,7 +194,7 @@
    1. -
    2. August 2019
      3. +
    3. September 2020
    4. git-pr(1)
    diff -Nru git-extras-6.0.0/man/git-pr.md git-extras-6.1.0/man/git-pr.md --- git-extras-6.0.0/man/git-pr.md 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-pr.md 2020-09-26 12:11:50.000000000 +0000 @@ -3,9 +3,9 @@ ## SYNOPSIS -`git-pr`[-m|--merge] <number> [<remote>]
    -`git-pr [-m|--merge] <[remote]:number>...
    -`git-pr`[-m|--merge] <url>...
    +`git-pr` [-m|--merge] <number> [<remote>]
    +`git-pr` [-m|--merge] <[remote]:number>...
    +`git-pr` [-m|--merge] <url>...
    `git-pr clean` ## DESCRIPTION @@ -93,7 +93,7 @@ To clean up old branches: $ git pr clean - + Deleted branch pr/226 (was b96a8c2). Deleted branch pr/220 (was d34dc0f). Deleted branch pr/775 (was de6e51c). diff -Nru git-extras-6.0.0/man/git-pull-request.1 git-extras-6.1.0/man/git-pull-request.1 --- git-extras-6.0.0/man/git-pull-request.1 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-pull-request.1 2020-09-26 12:11:50.000000000 +0000 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-PULL\-REQUEST" "1" "November 2017" "" "Git Extras" +.TH "GIT\-PULL\-REQUEST" "1" "August 2020" "" "Git Extras" . .SH "NAME" \fBgit\-pull\-request\fR \- Create pull request for GitHub project @@ -13,7 +13,16 @@ Create pull request for a project on GitHub via command line\. . .P -Uses the email from \fBgit config user\.email\fR to open the pull request\. +A personal access token is required for making the API call to open the pull request(s) in GitHub\. API Documentation here \fIhttps://docs\.github\.com/en/rest/reference/pulls#create\-a\-pull\-request\fR +. +.P +Make sure the personal access token has the right \fBOAuth\fR scopes for the repo(s) +. +.P +Use \fBgit config \-\-global \-\-add git\-extras\.github\-personal\-access\-token \fR +. +.P +If using multiple accounts, override the global value in the specific repo using \fBgit config git\-extras\.github\-personal\-access\-token \fR . .SH "OPTIONS" @@ -35,7 +44,6 @@ base [master]: GitHub two\-factor authentication code (leave blank if not set up): -Enter host password for user \'spacewanderlzx@gmail\.com\': \.\.\. . .fi diff -Nru git-extras-6.0.0/man/git-pull-request.html git-extras-6.1.0/man/git-pull-request.html --- git-extras-6.0.0/man/git-pull-request.html 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-pull-request.html 2020-09-26 12:11:50.000000000 +0000 @@ -82,7 +82,13 @@

    Create pull request for a project on GitHub via command line.

    -

    Uses the email from git config user.email to open the pull request.

    +

    A personal access token is required for making the API call to open the pull request(s) in GitHub. API Documentation here

    + +

    Make sure the personal access token has the right OAuth scopes for the repo(s)

    + +

    Use git config --global --add git-extras.github-personal-access-token <your-personal-access-token>

    + +

    If using multiple accounts, override the global value in the specific repo using git config git-extras.github-personal-access-token <other-acc-personal-access-token>

    OPTIONS

    @@ -102,13 +108,12 @@ base [master]: GitHub two-factor authentication code (leave blank if not set up): -Enter host password for user 'spacewanderlzx@gmail.com': ...

    AUTHOR

    -

    Written by Tj Holowaychuk <tj@vision-media.ca>

    +

    Written by Tj Holowaychuk <tj@vision-media.ca>

    REPORTING BUGS

    @@ -121,7 +126,7 @@
    1. -
    2. November 2017
      3. +
    3. August 2020
    4. git-pull-request(1)
    diff -Nru git-extras-6.0.0/man/git-pull-request.md git-extras-6.1.0/man/git-pull-request.md --- git-extras-6.0.0/man/git-pull-request.md 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-pull-request.md 2020-09-26 12:11:50.000000000 +0000 @@ -9,7 +9,13 @@ Create pull request for a project on GitHub via command line. -Uses the email from `git config user.email` to open the pull request. +A personal access token is required for making the API call to open the pull request(s) in GitHub. [API Documentation here](https://docs.github.com/en/rest/reference/pulls#create-a-pull-request) + +Make sure the personal access token has the right `OAuth` scopes for the repo(s) + +Use `git config --global --add git-extras.github-personal-access-token ` + +If using multiple accounts, override the global value in the specific repo using `git config git-extras.github-personal-access-token ` ## OPTIONS @@ -30,7 +36,6 @@ base [master]: GitHub two-factor authentication code (leave blank if not set up): -Enter host password for user 'spacewanderlzx@gmail.com': ... ``` diff -Nru git-extras-6.0.0/man/git-summary.1 git-extras-6.1.0/man/git-summary.1 --- git-extras-6.0.0/man/git-summary.1 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-summary.1 2020-09-26 12:11:50.000000000 +0000 @@ -1,22 +1,22 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-SUMMARY" "1" "October 2019" "" "Git Extras" +.TH "GIT\-SUMMARY" "1" "August 2020" "" "Git Extras" . .SH "NAME" \fBgit\-summary\fR \- Show repository summary . .SH "SYNOPSIS" -\fBgit\-summary\fR [\-\-line] [\-\-dedup\-by\-email] [] +\fBgit\-summary\fR [\-\-line] [\-\-dedup\-by\-email] [] . .SH "DESCRIPTION" Shows a summary of the repository\. . .SH "OPTIONS" - + . .P -Summarize only the range of commits included in the \. +Summarize only the range of commits included in the \. . .P \-\-dedup\-by\-email @@ -48,7 +48,7 @@ \-\-line . .P -Summarize with lines other than commits\. Any is ignored when \-\-line is specified\. +Summarize with lines other than commits\. Any is ignored when \-\-line is specified\. . .SH "EXAMPLES" Outputs a repo summary: @@ -89,7 +89,7 @@ .IP "" 0 . .P -This command can also take a commitish, and will print a summary for the range of commits included in the commitish: +This command can also take a committish, and will print a summary for the range of commits included in the committish: . .IP "" 4 . @@ -120,7 +120,7 @@ .IP "" 0 . .P -The commitish is ignored when \-\-line is specified\. +The committish is ignored when \-\-line is specified\. . .SH "AUTHOR" Written by Tj Holowaychuk <\fItj@vision\-media\.ca\fR> diff -Nru git-extras-6.0.0/man/git-summary.html git-extras-6.1.0/man/git-summary.html --- git-extras-6.0.0/man/git-summary.html 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-summary.html 2020-09-26 12:11:50.000000000 +0000 @@ -76,7 +76,7 @@

    SYNOPSIS

    -

    git-summary [--line] [--dedup-by-email] [<commitish>]

    +

    git-summary [--line] [--dedup-by-email] [<committish>]

    DESCRIPTION

    @@ -84,9 +84,9 @@

    OPTIONS

    -

    <commitish>

    +

    <committish>

    -

    Summarize only the range of commits included in the <commitish>.

    +

    Summarize only the range of commits included in the <committish>.

    --dedup-by-email

    @@ -108,7 +108,7 @@

    --line

    Summarize with lines other than commits. - Any <commitish> is ignored when --line is specified.

    + Any <committish> is ignored when --line is specified.

    EXAMPLES

    @@ -142,8 +142,8 @@ 1 Matt Colyer -

    This command can also take a commitish, and will print a summary for the range - of commits included in the commitish:

    +

    This command can also take a committish, and will print a summary for the range + of commits included in the committish:

    $ git summary v42..
    @@ -158,11 +158,11 @@ ... -

    The commitish is ignored when --line is specified.

    +

    The committish is ignored when --line is specified.

    AUTHOR

    -

    Written by Tj Holowaychuk <tj@vision-media.ca>

    +

    Written by Tj Holowaychuk <tj@vision-media.ca>

    REPORTING BUGS

    @@ -175,7 +175,7 @@
    1. -
    2. October 2019
      3. +
    3. August 2020
    4. git-summary(1)
    diff -Nru git-extras-6.0.0/man/git-summary.md git-extras-6.1.0/man/git-summary.md --- git-extras-6.0.0/man/git-summary.md 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/git-summary.md 2020-09-26 12:11:50.000000000 +0000 @@ -3,7 +3,7 @@ ## SYNOPSIS -`git-summary` [--line] [--dedup-by-email] [<commitish>] +`git-summary` [--line] [--dedup-by-email] [<committish>] ## DESCRIPTION @@ -11,9 +11,9 @@ ## OPTIONS - <commitish> + <committish> - Summarize only the range of commits included in the <commitish>. + Summarize only the range of commits included in the <committish>. --dedup-by-email @@ -34,7 +34,7 @@ --line Summarize with lines other than commits. - Any <commitish> is ignored when --line is specified. + Any <committish> is ignored when --line is specified. ## EXAMPLES @@ -67,8 +67,8 @@ 1 isaacs 1 Matt Colyer - This command can also take a commitish, and will print a summary for the range - of commits included in the commitish: + This command can also take a committish, and will print a summary for the range + of commits included in the committish: $ git summary v42.. @@ -81,7 +81,7 @@ authors : ... - The commitish is ignored when --line is specified. + The committish is ignored when --line is specified. ## AUTHOR diff -Nru git-extras-6.0.0/man/index.txt git-extras-6.1.0/man/index.txt --- git-extras-6.0.0/man/index.txt 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/man/index.txt 2020-09-26 12:11:50.000000000 +0000 @@ -2,7 +2,6 @@ git-alias(1) git-alias git-archive-file(1) git-archive-file git-authors(1) git-authors -git-back(1) git-back git-browse(1) git-browse git-brv(1) git-brv git-bulk(1) git-bulk diff -Nru git-extras-6.0.0/need_git_commit git-extras-6.1.0/need_git_commit --- git-extras-6.0.0/need_git_commit 2020-06-22 03:18:23.000000000 +0000 +++ git-extras-6.1.0/need_git_commit 2020-09-26 12:11:50.000000000 +0000 @@ -1,7 +1,6 @@ # A list of the commands in alphabetical order that require has_git_commit(), # and should have it included in the "built" version of the command git-authors -git-back git-changelog git-commits-since git-count