From 6e0107ca76297857d69853a6a3b8041d75a54b56 Mon Sep 17 00:00:00 2001 From: TJ Holowaychuk Date: Fri, 16 Dec 2011 09:08:30 -0800 Subject: [PATCH 01/11] Update Readme.md --- Readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/Readme.md b/Readme.md index f7e4fe6..b7412fb 100644 --- a/Readme.md +++ b/Readme.md @@ -31,7 +31,6 @@ $ brew install git-extras - `git pull-request` - `git count` - `git create-branch` - - `git apply-branch` - `git delete-branch` - `git delete-submodule` - `git delete-tag` From 2b77c93bf42a0b74f3771b6ad6ec7656ea94807b Mon Sep 17 00:00:00 2001 From: TJ Holowaychuk Date: Fri, 16 Dec 2011 09:08:43 -0800 Subject: [PATCH 02/11] Update Readme.md --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index b7412fb..b456138 100644 --- a/Readme.md +++ b/Readme.md @@ -7,7 +7,7 @@ Little git extras. Clone / Tarball: ```bash - $ make install +$ make install ``` One-liner: From 7a632e90262005d9cde0f3ad8a0664a1a8eb8f1d Mon Sep 17 00:00:00 2001 From: Jonhnny Weslley Date: Mon, 26 Dec 2011 11:39:12 -0300 Subject: [PATCH 03/11] remove git-promote use the `-u` option instead: git push -u origin branch_name --- Readme.md | 4 ---- bin/git-promote | 12 ------------ 2 files changed, 16 deletions(-) delete mode 100755 bin/git-promote diff --git a/Readme.md b/Readme.md index b456138..6b5b910 100644 --- a/Readme.md +++ b/Readme.md @@ -420,7 +420,3 @@ Set up a git repository (if one doesn't exist), add all files, and make an initi ## git-touch [filename] Call `touch` on the given file, and add it to the current index. One-step creation of new files. - -## git-promote - -Promotes a local topic branch to a remote tracking branch of the same name, by pushing and then setting up the `git config`. diff --git a/bin/git-promote b/bin/git-promote deleted file mode 100755 index 5007f8a..0000000 --- a/bin/git-promote +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -branch=$(git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||') - -remote_branch=$(git branch -r | grep "origin/${branch}") -test -z "${remote_branch}" && ( git push origin "${branch}" ) - -origin=$(git config --get "branch.${branch}.remote") -test -z "${origin}" && ( git config --add "branch.${branch}.remote" origin ) - -merge=$(git config --get "branch.${branch}.merge") -test -z "${merge}" && ( git config --add "branch.${branch}.merge" "refs/heads/${branch}" ) From b4fe82ffb45f5bf3ca19f29f3154e70a1eb24e63 Mon Sep 17 00:00:00 2001 From: Jonhnny Weslley Date: Mon, 26 Dec 2011 11:42:28 -0300 Subject: [PATCH 04/11] track gh-pages branch --- bin/git-gh-pages | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/git-gh-pages b/bin/git-gh-pages index 40fda3f..0553455 100755 --- a/bin/git-gh-pages +++ b/bin/git-gh-pages @@ -7,6 +7,6 @@ git symbolic-ref HEAD refs/heads/gh-pages \ && echo 'My Page' > index.html \ && git add . \ && git commit -a -m 'Initial commit' \ - && git push origin gh-pages \ + && git push -u origin gh-pages \ && git fetch origin \ - && echo 'complete' \ No newline at end of file + && echo 'complete' From 40b131d9ccefbedaa4dd0e6ecf730d75cd8e507d Mon Sep 17 00:00:00 2001 From: TJ Holowaychuk Date: Fri, 30 Dec 2011 11:16:18 -0800 Subject: [PATCH 05/11] Release 0.8.1 --- History.md | 5 +++++ bin/git-extras | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index e63ec8c..1ea3a3e 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,9 @@ +0.8.1 / 2011-12-30 +================== + + * Removed `git-promote` + 0.8.0 / 2011-12-08 ================== diff --git a/bin/git-extras b/bin/git-extras index 7a98343..93d772c 100755 --- a/bin/git-extras +++ b/bin/git-extras @@ -1,6 +1,6 @@ #!/bin/sh -VERSION="0.8.0" +VERSION="0.8.1" update() { local orig=$PWD From 3c26c9497205e36884bca2ff4cc02aac9df7b59c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leandro=20L=C3=B3pez?= Date: Sat, 31 Dec 2011 12:17:12 -0200 Subject: [PATCH 06/11] Adding `git-ignore` patterns from template was inside `git-create-branch` documentation. --- Readme.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Readme.md b/Readme.md index 6b5b910..cc8fa3b 100644 --- a/Readme.md +++ b/Readme.md @@ -293,6 +293,12 @@ $ git ignore build "*.o" "*.log" ... added '*.log' ``` +Add patterns from an existing template: + +```bash +$ git ignore -t rails +``` + Without any patterns, `git-ignore` displays currently ignored patterns: ```bash @@ -310,12 +316,6 @@ Create local and remote branch `name`: $ git create-branch development ``` -Add patterns from an existing template: - -```bash -$ git ignore -t rails -``` - ## git-delete-branch <name> Delete local and remote branch `name`: From 1c9867b47662b3e542524008bc48b9cd1423ebf2 Mon Sep 17 00:00:00 2001 From: Jonhnny Weslley Date: Fri, 20 May 2011 14:25:59 -0300 Subject: [PATCH 07/11] remove git-ignore garbage --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index bfa6d33..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "etc/gitignore"] - path = etc/gitignore - url = git://github.com/github/gitignore.git From e4df35beff96e6dcfe168abd646f0391c3863a4c Mon Sep 17 00:00:00 2001 From: Jonhnny Weslley Date: Sat, 21 May 2011 23:05:35 -0300 Subject: [PATCH 08/11] bash completion script --- etc/bash_completion.sh | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 etc/bash_completion.sh diff --git a/etc/bash_completion.sh b/etc/bash_completion.sh new file mode 100644 index 0000000..273c680 --- /dev/null +++ b/etc/bash_completion.sh @@ -0,0 +1,49 @@ +# bash completion support for git-extras. + +_git_changelog(){ + __gitcomp "--list" +} + +_git_contrib(){ + __gitcomp "$(git shortlog -s | cut -f2)" # TODO buggy if author's name contains whitespaces :( +} + +_git_count(){ + __gitcomp "--all" +} + +_git_delete_branch(){ + __gitcomp "$(__git_heads)" +} + +_git_delete_submodule(){ + __gitcomp "$(git submodule status | awk '{print $2}')" +} + +_git_delete_tag(){ + __gitcomp "$(__git_tags)" +} + +_git_extras(){ + __gitcomp "--version update" +} + +_git_graft(){ + __gitcomp "$(__git_heads)" +} + +__git_extras_workflow(){ + __gitcomp "$(__git_heads | grep ^$1/ | sed s/^$1\\///g) finish" +} + +_git_feature(){ + __git_extras_workflow "feature" +} + +_git_refactor(){ + __git_extras_workflow "refactor" +} + +_git_bug(){ + __git_extras_workflow "bug" +} From ad19d2fdcf5710b945a177159e93b4749b52e0c9 Mon Sep 17 00:00:00 2001 From: Jonhnny Weslley Date: Sat, 21 May 2011 23:06:52 -0300 Subject: [PATCH 09/11] (un)installation instructions --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index d41fa3d..4a94be1 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ install: cp -f $(BIN) $(PREFIX)/$(BIN); \ ) cp -f man/git-*.1 $(MANPREFIX) + cp -f etc/bash_completion.sh /etc/bash_completion.d/git-extras docs: $(MAN_HTML) $(MAN_PAGES) @@ -41,6 +42,7 @@ uninstall: echo "... uninstalling $(MANPREFIX)/$(MAN)"; \ rm -f $(MANPREFIX)/$(MAN); \ ) + rm -f /etc/bash_completion.d/git-extras clean: docclean From 8ad024a51540147263ce35e18e95ec02aea0837b Mon Sep 17 00:00:00 2001 From: TJ Holowaychuk Date: Sun, 15 Jan 2012 13:25:46 -0800 Subject: [PATCH 10/11] make /etc/bash_completion.d --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 4a94be1..113482e 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ install: cp -f $(BIN) $(PREFIX)/$(BIN); \ ) cp -f man/git-*.1 $(MANPREFIX) + @mkdir -p /etc/bash_completion.d cp -f etc/bash_completion.sh /etc/bash_completion.d/git-extras docs: $(MAN_HTML) $(MAN_PAGES) From 948308bbf0656e86aab134f0f52a5d7943b83b6f Mon Sep 17 00:00:00 2001 From: TJ Holowaychuk Date: Sun, 15 Jan 2012 13:26:23 -0800 Subject: [PATCH 11/11] Release 0.9.0 --- History.md | 5 +++++ bin/git-extras | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index 1ea3a3e..e1a03bf 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,9 @@ +0.9.0 / 2012-01-15 +================== + + * Added bash completion support [jweslley] + 0.8.1 / 2011-12-30 ================== diff --git a/bin/git-extras b/bin/git-extras index 93d772c..8424da6 100755 --- a/bin/git-extras +++ b/bin/git-extras @@ -1,6 +1,6 @@ #!/bin/sh -VERSION="0.8.1" +VERSION="0.9.0" update() { local orig=$PWD