From 760e64b864ad75ebc54b0c7d84cbb326bfcf1c95 Mon Sep 17 00:00:00 2001 From: spacewander Date: Fri, 1 Oct 2021 20:01:47 +0800 Subject: [PATCH 1/3] git-delete-squashed-branches: fail fast if can't checkout --- bin/git-delete-squashed-branches | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/git-delete-squashed-branches b/bin/git-delete-squashed-branches index 6707da0..25359fc 100755 --- a/bin/git-delete-squashed-branches +++ b/bin/git-delete-squashed-branches @@ -1,10 +1,11 @@ #!/usr/bin/env bash -targetBranch=$1 +set -euo pipefail -if [[ -z $targetBranch ]]; then +if [[ $# -eq 0 ]]; then targetBranch=$(git rev-parse --abbrev-ref HEAD) else + targetBranch=$1 git checkout $targetBranch fi From 0c0be924459c68aac9f2cf1acadb302dad1c64f6 Mon Sep 17 00:00:00 2001 From: spacewander Date: Sat, 2 Oct 2021 13:25:45 +0800 Subject: [PATCH 2/3] Version 6.3.0 --- AUTHORS | 11 ++++++++++- History.md | 44 ++++++++++++++++++++++++++++++++++++++++++++ bin/git-extras | 2 +- 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 64a1091..1ac1bd4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -36,8 +36,10 @@ Patches and Suggestions - Mark Pitman - Luke Childs - Sasha Khamkov +- Tobias Fendin - equt - vyas +- Don Harper - Robin Winslow - Yi EungJun - grindhold @@ -65,6 +67,7 @@ Patches and Suggestions - Philipp Klose - Richard Russon - Sam Bostock +- Vladimir Jimenez - gisphm - jacobherrington - phigoro @@ -133,6 +136,7 @@ Patches and Suggestions - Carlos Rodríguez - Christophe Badoit - Ciro Nunes +- CleanMachine1 - Craig MacGregor - Dan Jackson - Dan Kilman @@ -152,6 +156,7 @@ Patches and Suggestions - Guillermo Rauch - Gunnlaugur Thor Briem - Hasse Ramlev Hansen +- Heiko Becker - Isaac Mungai - J.C. Yamokoski - James Manning @@ -175,6 +180,7 @@ Patches and Suggestions - Luis Miguel Hernanz - Maarten Winter - Marco Glasbergen +- Matan Rosenberg - Mathieu D. (MatToufoutu) - Matt - Matt Colyer @@ -188,11 +194,13 @@ Patches and Suggestions - Nathan Rajlich - Nick Campbell - Nick Payne +- Nicolas Kosinski - Niklas Fiekas - Oliver Kopp - Orestis - Peter Bittner - Prayag Verma +- Przemek Kitszel - R. Martinho Fernandes - Raphael Fleischlin - Rasmus Wriedt Larsen @@ -205,6 +213,7 @@ Patches and Suggestions - Sean Molenaar - Sebastian Gniazdowski - Sebastián Mancilla +- Simon Tate - Stefan VanBuren - Stephen Mathieson - Steve Mao @@ -222,6 +231,7 @@ Patches and Suggestions - Xavier Krantz - Xiaopei Li - Zeeshan Ahmed +- ax1036 - creynders - dead-horse - eszabpt @@ -237,4 +247,3 @@ Patches and Suggestions - Étienne BERSAC - ☃ pitr - 单元源 -- Don 'duckunix' Harper diff --git a/History.md b/History.md index a5e2ccd..a3103ff 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,48 @@ +6.3.0 / 2021-10-02 +================== + + * Merge pull request #942 from spacewander/ffgd + * git-delete-squashed-branches: fail fast if can't checkout + * Merge pull request #939 from SimonTate/feature/force-clear + * git-clear: add force option + * Merge pull request #936 from tfendin/multiline_synopsis_fix + * Merge pull request #937 from tfendin/dedup_email_case_insensitive + * Merge pull request #934 from tfendin/no-merge-summary + * Adopted git --dedup-by-email to the project coding style + * summary --dedup-by-email now compares email adresses case insensitive. + * Updated lines under Synopsis in the manuals so they are commonly formatted + * Add incompability check for git summary --line --no-merges, split synopsis in its manual. + * Merge pull request #935 from ax1036/git-un-lock + * fix git (un)lock with spaced filenames + * Updated completion for git summary + * Updated documentation for git-summary --no-merges + * Added option --no-merges to git summary + * Merge pull request #932 from spacewander/git-su + * git-summary: support filtering `--line` with path + * Merge pull request #865 from pkitszel/pkitszel-git-abort + * Add git-abort + * Merge pull request #928 from duckunix/master + * Update point to github docs for forks from API + * update working + * git-fork | Update man/md/html pages to talk about need of the github personal access token + * Updated documentation (AUTHORS) + * bin/git-fork | updating for feedback from PR #928 + * git-fork | update to match REST-API auth standards as of 2021-06 + * Merge pull request #926 from nicokosi/patch-1 + * Update install doc: Homebrew is not just for macOS + * Merge pull request #924 from allejo/feature/delete-squashed-branches + * delete-squashed-branches: Make side-effect clear in docs + * delete-squashed-branches: Make branch checkout side effect clear + * Add delete-squashed-branches command + * Merge pull request #923 from CleanMachine1/patch-1 + * Picture is broken + * Merge pull request #920 from matan129/patch-1 + * Ignore checked-out branches on different worktrees + * Merge pull request #917 from heirecka/remove-git-line-summary-man-page + * Bump version to 6.3.0-dev + * doc: Remove man page for git-line-summary + 6.2.0 / 2021-03-26 ================== diff --git a/bin/git-extras b/bin/git-extras index ef55156..e4f0796 100755 --- a/bin/git-extras +++ b/bin/git-extras @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERSION="6.3.0-dev" +VERSION="6.3.0" INSTALL_SCRIPT="https://raw.githubusercontent.com/tj/git-extras/master/install.sh" update() { From 96890821b0324e5efa6aaadc9a793a1556640ea6 Mon Sep 17 00:00:00 2001 From: spacewander Date: Sun, 3 Oct 2021 21:25:29 +0800 Subject: [PATCH 3/3] Bump version to 6.4.0-dev --- bin/git-extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/git-extras b/bin/git-extras index e4f0796..a86fb6e 100755 --- a/bin/git-extras +++ b/bin/git-extras @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERSION="6.3.0" +VERSION="6.4.0-dev" INSTALL_SCRIPT="https://raw.githubusercontent.com/tj/git-extras/master/install.sh" update() {