From fbd2d8fe73c65e4387e972229c1cfcbf3a590473 Mon Sep 17 00:00:00 2001 From: Alexander Krasnukhin Date: Sun, 18 Nov 2012 11:18:05 +0100 Subject: [PATCH 1/4] Delete tag on origin even if it wasn't locally fetched yet. This should keep consistent logic among scripts i.e. git-delete-tag should behave the same way as git-delete-branch. --- bin/git-delete-tag | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/git-delete-tag b/bin/git-delete-tag index 506a575..c93a5d0 100755 --- a/bin/git-delete-tag +++ b/bin/git-delete-tag @@ -2,4 +2,5 @@ tagname=$1 test -z $tagname && echo "tag required." 1>&2 && exit 1 -git tag -d $tagname && git push origin :refs/tags/$tagname +git tag -d $tagname +git push origin :refs/tags/$tagname From 7b8c38a4bdece2b996bdfe0d533c8238a9f91d22 Mon Sep 17 00:00:00 2001 From: Gunnlaugur Thor Briem Date: Thu, 22 Nov 2012 18:19:19 +0000 Subject: [PATCH 2/4] Move misplaced text into git effort section --- Readme.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Readme.md b/Readme.md index 710cf19..2724005 100644 --- a/Readme.md +++ b/Readme.md @@ -182,6 +182,12 @@ node (master): git effort --above 15 {src,lib}/* ``` $ git effort --above 5 +``` + + By default `git ls-files` is used, however you may pass one or more files to `git-effort(1)`, for example: + +``` +$ git effort bin/* lib/* ``` ## git-repl @@ -203,12 +209,6 @@ bin/git-ignore bin/git-release git> quit -``` - - By default `git ls-files` is used, however you may pass one or more files to `git-effort(1)`, for example: - -``` -$ git effort bin/* lib/* ``` ## git-commits-since [date] From e71fa3f9e8d5d6a8e77fd26f870b0993a34cd130 Mon Sep 17 00:00:00 2001 From: NANRI Date: Wed, 23 Jan 2013 06:59:13 +0900 Subject: [PATCH 3/4] fix typo --- Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Readme.md b/Readme.md index 2724005..6d3e774 100644 --- a/Readme.md +++ b/Readme.md @@ -66,7 +66,7 @@ $ brew install git-extras - `git promote` - `git local-commits` -## extras +## git-extras The main `git-extras` command. @@ -89,7 +89,7 @@ $ git extras update ``` -## gh-pages +## git-gh-pages Sets up the `gh-pages` branch. (See [GitHub Pages](http://pages.github.com/) documentation.) From a06d5529339da2ebc472c2581188a2a8874acdef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=98=83=20pitr?= Date: Thu, 24 Jan 2013 13:16:08 -0500 Subject: [PATCH 4/4] fix delete-branch to work with same-name tags when there's a tag and a branch with the same name, git errors out with `error: dst refspec MY_BRANCH matches more than one.` git-delete-tag is not affected by this bug --- bin/git-delete-branch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/git-delete-branch b/bin/git-delete-branch index bde6fdc..1417a65 100755 --- a/bin/git-delete-branch +++ b/bin/git-delete-branch @@ -4,4 +4,4 @@ branch=$1 test -z $branch && echo "branch required." 1>&2 && exit 1 git branch -D $branch git branch -d -r origin/$branch -git push origin :$branch +git push origin :refs/heads/$branch