diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c48bf91352..2150081105c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ Git Town is a welcoming community, and we'd love for everyone to bring their contributions of any size to make it even better. - Found a bug or have an idea for a new feature? - - [Open an issue](https://github.com/Originate/git-town/issues/new) + [Open an issue](https://github.com/git-town/git-town/issues/new) - Fixed a bug or created a new feature that others will enjoy? - [Create a pull request](https://help.github.com/articles/using-pull-requests/) @@ -25,10 +25,10 @@ when developing Git Town. - set the environment variable `$GOPATH` to your Go workspace (you can point it to any folder on your hard drive, let's assume `~/go` here) - add `~/go/bin` to your `$PATH` - - create the directory `~/go/src/github.com/Originate` + - create the directory `~/go/src/github.com/git-town` - cd into that directory, and run - `git clone git@github.com:Originate/git-town.git` - - cd into `$GOPATH/src/github.com/Originate/git-town` + `git clone git@github.com:git-town/git-town.git` + - cd into `$GOPATH/src/github.com/git-town/git-town` - make sure you have `make` - Mac and Linux users should be okay, Windows users should install [Make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm) @@ -37,8 +37,8 @@ when developing Git Town. - now you can run `git-town` on the command line - see https://golang.org/doc/install#testing for details on how to test - optionally install - [Tertestrial](https://github.com/Originate/tertestrial-server) for - auto-running tests + [Tertestrial](https://github.com/git-town/tertestrial-server) for auto-running + tests - optionally install [scc](https://github.com/boyter/scc) to see code statistics via make stats @@ -117,7 +117,7 @@ Please follow the existing code style. Each pull request (PR) should have the same (optional) description that it will have when committed later and include the -[issue](https://github.com/Originate/git-town/issues) it resolves. +[issue](https://github.com/git-town/git-town/issues) it resolves. When merging approved PRs: @@ -140,7 +140,7 @@ Implements #123 ## Release Process -#### Originate/git-town +#### git-town/git-town - Create a feature branch which updates `RELEASE_NOTES.md` - Get the feature branch reviewed and merged diff --git a/LICENSE b/LICENSE index a5f3e0085e3..d0c618ee866 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2018 Originate +Copyright (c) 2014-2018 the Git Town creators Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/Makefile b/Makefile index d6b4c6a1393..fba1d26d436 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,14 @@ date := $(shell TZ=UTC date -u '+%Y-%m-%d') build: # builds for the current platform - go install -ldflags "-X github.com/Originate/git-town/src/cmd.version=v0.0.0-test -X github.com/Originate/git-town/src/cmd.buildDate=today" + go install -ldflags "-X github.com/git-town/git-town/src/cmd.version=v0.0.0-test -X github.com/git-town/git-town/src/cmd.buildDate=today" build-release: cross-compile # builds the artifacts for a new release package/debian/make_deb.sh cross-compile: # builds the binary for all platforms go get github.com/mitchellh/gox - gox -ldflags "-X github.com/Originate/git-town/src/cmd.version=${TRAVIS_TAG} -X github.com/Originate/git-town/src/cmd.buildDate=${date}" \ + gox -ldflags "-X github.com/git-town/git-town/src/cmd.version=${TRAVIS_TAG} -X github.com/git-town/git-town/src/cmd.buildDate=${date}" \ -output "dist/{{.Dir}}-${TRAVIS_TAG}-{{.OS}}-{{.Arch}}" cuke: cuke-go cuke-ruby # runs the feature tests diff --git a/README.md b/README.md index 46b67ecdd56..75501cc3512 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -![Git Town](https://originate.github.io/git-town/documentation/logo-horizontal.svg) +![Git Town](https://git-town.github.io/git-town/documentation/logo-horizontal.svg) -[![Build Status](https://travis-ci.org/Originate/git-town.svg?branch=master)](https://travis-ci.org/Originate/git-town) -[![Go Report Card](https://goreportcard.com/badge/github.com/Originate/git-town)](https://goreportcard.com/report/github.com/Originate/git-town) +[![Build Status](https://travis-ci.org/git-town/git-town.svg?branch=master)](https://travis-ci.org/git-town/git-town) +[![Go Report Card](https://goreportcard.com/badge/github.com/git-town/git-town)](https://goreportcard.com/report/github.com/git-town/git-town) [![License](https://img.shields.io/:license-MIT-blue.svg?style=flat)](LICENSE) [![Help Contribute to Open Source](https://www.codetriage.com/originate/git-town/badges/users.svg)](https://www.codetriage.com/originate/git-town) @@ -136,7 +136,7 @@ command line for an overview of the Git Town commands, or `git help ` ## Contributing Found a bug or have an idea for a new feature? -[Open an issue](https://github.com/Originate/git-town/issues/new) or - even +[Open an issue](https://github.com/git-town/git-town/issues/new) or - even better - get down, go to town, and fire a feature-tested [pull request](https://help.github.com/articles/using-pull-requests/) our way! Check out our [contributing guide](/CONTRIBUTING.md) to start coding. diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 1f281bc0aeb..5aeb7edd21d 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -111,7 +111,7 @@ #### Bug Fixes - `git ship`: fix bug when encountering a merge conflict and using a code - hosting driver ([#1060](https://github.com/Originate/git-town/issues/1060)) + hosting driver ([#1060](https://github.com/git-town/git-town/issues/1060)) ## 5.0.0 (2017-08-16) @@ -161,7 +161,7 @@ #### Bug Fixes - temporary file: make parent directories if needed - ([#955 comment](https://github.com/Originate/git-town/issues/955#issuecomment-306041043)) + ([#955 comment](https://github.com/git-town/git-town/issues/955#issuecomment-306041043)) ## 4.1.0 (2017-06-01) @@ -175,12 +175,12 @@ #### Changes - make `hack-push-flag` false by default (previously was true) - ([#929](https://github.com/Originate/git-town/issues/929)) + ([#929](https://github.com/git-town/git-town/issues/929)) #### Bug Fixes - replace all non-alpha numeric characters in temporary filename - ([#925](https://github.com/Originate/git-town/issues/925)) + ([#925](https://github.com/git-town/git-town/issues/925)) - fix spacing in parent branch prompts - enforce a minimum Git version of 2.7.0 @@ -229,25 +229,25 @@ #### Bug Fixes - fix incorrectly reported branch loop - ([#785](https://github.com/Originate/git-town/issues/785)) + ([#785](https://github.com/git-town/git-town/issues/785)) ## 2.1.0 (2016-12-26) #### New Features - support multiple SSH identities - ([#739](https://github.com/Originate/git-town/issues/739)) + ([#739](https://github.com/git-town/git-town/issues/739)) #### Bug Fixes - update stashing strategy to avoid use of `git stash -u` which can delete - ignored files ([#744](https://github.com/Originate/git-town/issues/744)) + ignored files ([#744](https://github.com/git-town/git-town/issues/744)) - fix merge conflicts resolution that results in no changes - ([#753](https://github.com/Originate/git-town/issues/753)) + ([#753](https://github.com/git-town/git-town/issues/753)) - `git hack`: prompt for parent branch if unknown - ([#760](https://github.com/Originate/git-town/issues/760)) + ([#760](https://github.com/git-town/git-town/issues/760)) - prevent parent branch loops - ([#751](https://github.com/Originate/git-town/issues/751)) + ([#751](https://github.com/git-town/git-town/issues/751)) ## 2.0.0 (2016-09-18) @@ -268,25 +268,25 @@ - `git town set-parent-branch `: to update a parent branch - ([#729](https://github.com/Originate/git-town/issues/729)) + ([#729](https://github.com/git-town/git-town/issues/729)) #### Bug Fixes - `git sync --all`: don't prompt for parent of perennial branches - ([#727](https://github.com/Originate/git-town/issues/727)) + ([#727](https://github.com/git-town/git-town/issues/727)) ## 0.10.1 (2016-06-23) #### New Features - `git hack`: add configuration for whether or not to push - ([#720](https://github.com/Originate/git-town/issues/720)) + ([#720](https://github.com/git-town/git-town/issues/720)) #### Bug Fixes - configuration: make branch order consistent - `git ship`: update uncommitted changes error message - ([#718](https://github.com/Originate/git-town/issues/718)) + ([#718](https://github.com/git-town/git-town/issues/718)) ## 0.10.0 (2016-01-21) @@ -294,21 +294,21 @@ - `git prune-branches`: new functionality - delete branches whose tracking branch no longer exists - ([#702](https://github.com/Originate/git-town/issues/702)) + ([#702](https://github.com/git-town/git-town/issues/702)) #### New Features - `git sync`: add configuration option to merge the main branch / perennial branches with their upstream - ([#671](https://github.com/Originate/git-town/issues/671)) + ([#671](https://github.com/git-town/git-town/issues/671)) - `git hack`, `git ship`: support for running in subfolders #### Bug Fixes - internationalize check for undefined function - ([#678](https://github.com/Originate/git-town/issues/678)) + ([#678](https://github.com/git-town/git-town/issues/678)) - `git new-pull-request`: ability to continue after conflicts - ([#700](https://github.com/Originate/git-town/issues/700)) + ([#700](https://github.com/git-town/git-town/issues/700)) ## 0.9.0 (2015-10-17) @@ -319,10 +319,9 @@ #### New Features - `git new-pull-request`: support forked repos - ([#682](https://github.com/Originate/git-town/issues/682)) + ([#682](https://github.com/git-town/git-town/issues/682)) - `git sync`: if there is a remote upstream, the main branch is synced with its - upstream counterpart - ([#685](https://github.com/Originate/git-town/issues/685)) + upstream counterpart ([#685](https://github.com/git-town/git-town/issues/685)) ## 0.8.0 (2015-10-14) @@ -342,64 +341,64 @@ recover from bad input - parent branch prompt: only show description and branch list once per command - preserve checkout history so that `git checkout -` works as expected alongside - Git Town commands ([#65](https://github.com/Originate/git-town/issues/65)) + Git Town commands ([#65](https://github.com/git-town/git-town/issues/65)) - `git hack`: pushes the new branch to the remote repository - ([#664](https://github.com/Originate/git-town/issues/664)) + ([#664](https://github.com/git-town/git-town/issues/664)) - `git new-pull-request`: syncs the branch before creating the pull request - ([#367](https://github.com/Originate/git-town/issues/367)) + ([#367](https://github.com/git-town/git-town/issues/367)) - `git sync --all`: pushes tags - ([#464](https://github.com/Originate/git-town/issues/464)) + ([#464](https://github.com/git-town/git-town/issues/464)) - `git town config`: shows branch ancestry - ([#651](https://github.com/Originate/git-town/issues/651)) + ([#651](https://github.com/git-town/git-town/issues/651)) #### Bug Fixes - `git town version`: Homebrew installs no longer print date and SHA - ([#631](https://github.com/Originate/git-town/issues/631)) + ([#631](https://github.com/git-town/git-town/issues/631)) ## 0.7.3 (2015-09-02) - `git kill`: remote only branch - ([#380](https://github.com/Originate/git-town/issues/380)) + ([#380](https://github.com/git-town/git-town/issues/380)) - `git ship`: prompt when there are multiple authors - ([#486](https://github.com/Originate/git-town/issues/486)) + ([#486](https://github.com/git-town/git-town/issues/486)) ## 0.7.2 (2015-08-28) - `git sync --all`: fix parent branch prompt - `git ship`: comment out default commit message - ([#382](https://github.com/Originate/git-town/issues/382)) + ([#382](https://github.com/git-town/git-town/issues/382)) ## 0.7.1 (2015-08-27) - `git ship`: add ability to ship remote only branch - ([#593](https://github.com/Originate/git-town/issues/593)) + ([#593](https://github.com/git-town/git-town/issues/593)) - `git new-pull-request`/`git repo`: remove empty line output - ([#602](https://github.com/Originate/git-town/issues/602)) + ([#602](https://github.com/git-town/git-town/issues/602)) - `git kill`: prompt for unknown parent branch - ([#603](https://github.com/Originate/git-town/issues/603)) + ([#603](https://github.com/git-town/git-town/issues/603)) - `git sync --all`: prompt for unknown parent branch - ([#604](https://github.com/Originate/git-town/issues/604)) + ([#604](https://github.com/git-town/git-town/issues/604)) - support branch names with forward slashes (along with any valid branch name) - ([#608](https://github.com/Originate/git-town/issues/608)) + ([#608](https://github.com/git-town/git-town/issues/608)) ## 0.7.0 (2015-08-24) - fix `git ship --undo` - ([#550](https://github.com/Originate/git-town/issues/550)) + ([#550](https://github.com/git-town/git-town/issues/550)) - rename `non-feature-branches` to `perennial-branches` - ([#344](https://github.com/Originate/git-town/issues/344)) + ([#344](https://github.com/git-town/git-town/issues/344)) - configuration is automatically updated to support this - support for nested feature branches - ([#529](https://github.com/Originate/git-town/issues/529)) + ([#529](https://github.com/git-town/git-town/issues/529)) - add `git rename-branch` - ([#474](https://github.com/Originate/git-town/issues/474)) + ([#474](https://github.com/git-town/git-town/issues/474)) - rename `git pull-request` to `git new-pull-request` - ([#413](https://github.com/Originate/git-town/issues/413), - [#507](https://github.com/Originate/git-town/issues/507)) + ([#413](https://github.com/git-town/git-town/issues/413), + [#507](https://github.com/git-town/git-town/issues/507)) - add SHA and date to output of `git town version` for manual installs - show error when trying to continue after a successful command - ([#364](https://github.com/Originate/git-town/issues/364)) + ([#364](https://github.com/git-town/git-town/issues/364)) ## 0.6.0 (2015-04-02) @@ -411,7 +410,7 @@ - **git ship** - now accepts all `git commit` options - author with the most commits is automatically set as the author (when not - the committer) ([#335](https://github.com/Originate/git-town/issues/335)) + the committer) ([#335](https://github.com/git-town/git-town/issues/335)) - **git pr/repo** - improved linux compatibility by trying `xdg-open` before `open` - improved error messages when run outside a git repository @@ -425,136 +424,134 @@ within their clone of the repository - **git extract:** - errors if branch exists remotely - ([#236](https://github.com/Originate/git-town/issues/236)) + ([#236](https://github.com/git-town/git-town/issues/236)) - removed restriction: need to be on a feature branch - ([#269](https://github.com/Originate/git-town/issues/269)) + ([#269](https://github.com/git-town/git-town/issues/269)) - added restriction: if no commits are provided, errors if the current branch does not have any have extractable commits (commits not in the main branch) - ([#269](https://github.com/Originate/git-town/issues/269)) + ([#269](https://github.com/git-town/git-town/issues/269)) - **git hack:** errors if branch exists remotely - ([#237](https://github.com/Originate/git-town/issues/237)) + ([#237](https://github.com/git-town/git-town/issues/237)) - **git kill:** - optional branch name - ([#126](https://github.com/Originate/git-town/issues/126)) + ([#126](https://github.com/git-town/git-town/issues/126)) - does not error if tracking branch has already been deleted - ([#196](https://github.com/Originate/git-town/issues/196)) + ([#196](https://github.com/git-town/git-town/issues/196)) - **git pr:** - linux compatibility - ([#232](https://github.com/Originate/git-town/issues/232)) + ([#232](https://github.com/git-town/git-town/issues/232)) - compatible with more variants of specifying a Bitbucket or GitHub remote - ([#271](https://github.com/Originate/git-town/issues/271)) + ([#271](https://github.com/git-town/git-town/issues/271)) - compatible with respository names that contain ".git" - ([#305](https://github.com/Originate/git-town/issues/305)) + ([#305](https://github.com/git-town/git-town/issues/305)) - **git repo:** view the repository homepage - ([#140](https://github.com/Originate/git-town/issues/140)) + ([#140](https://github.com/git-town/git-town/issues/140)) - **git sync:** - `--all` option to sync all local branches - ([#83](https://github.com/Originate/git-town/issues/83)) + ([#83](https://github.com/git-town/git-town/issues/83)) - abort correctly after main branch updates and tracking branch conflicts - ([#228](https://github.com/Originate/git-town/issues/228)) + ([#228](https://github.com/git-town/git-town/issues/228)) - **git town**: view and change Git Town configuration and easily view help page - ([#98](https://github.com/Originate/git-town/issues/98)) + ([#98](https://github.com/git-town/git-town/issues/98)) - auto-completion for [Fish shell](http://fishshell.com) - ([#177](https://github.com/Originate/git-town/issues/177)) + ([#177](https://github.com/git-town/git-town/issues/177)) ## 0.4.1 (2014-12-02) - **git pr:** create a new pull request - ([#138](https://github.com/Originate/git-town/issues/138), - [40d22e](https://github.com/Originate/git-town/commit/40d22eb1703ac96a58ac5052e70d20d7bdb9ac73)) + ([#138](https://github.com/git-town/git-town/issues/138), + [40d22e](https://github.com/git-town/git-town/commit/40d22eb1703ac96a58ac5052e70d20d7bdb9ac73)) - **git ship:** - empty commit message aborts the command - ([#153](https://github.com/Originate/git-town/issues/153), - [0bc84e](https://github.com/Originate/git-town/commit/0bc84ee626299896661fe1754cfa227630725bb9)) + ([#153](https://github.com/git-town/git-town/issues/153), + [0bc84e](https://github.com/git-town/git-town/commit/0bc84ee626299896661fe1754cfa227630725bb9)) - abort when there are no shippable changes - ([#188](https://github.com/Originate/git-town/issues/188), - [52fd94](https://github.com/Originate/git-town/commit/52fd94eca05bd3c2db5e7ac36121f08e56b9558b)) + ([#188](https://github.com/git-town/git-town/issues/188), + [52fd94](https://github.com/git-town/git-town/commit/52fd94eca05bd3c2db5e7ac36121f08e56b9558b)) - **git sync:** - can now continue after just resolving conflicts (no need to commit or - continue rebasing) - ([#123](https://github.com/Originate/git-town/issues/123), - [1a50ad](https://github.com/Originate/git-town/commit/1a50ad689a752f4eaed663e0ab22184621ee96a2)) + continue rebasing) ([#123](https://github.com/git-town/git-town/issues/123), + [1a50ad](https://github.com/git-town/git-town/commit/1a50ad689a752f4eaed663e0ab22184621ee96a2)) - restores deleted tracking branch - ([#165](https://github.com/Originate/git-town/issues/165), - [259464](https://github.com/Originate/git-town/commit/2594646ad853d83a6d697354d66755a374e42b8a)) + ([#165](https://github.com/git-town/git-town/issues/165), + [259464](https://github.com/git-town/git-town/commit/2594646ad853d83a6d697354d66755a374e42b8a)) - **git extract:** errors if branch already exists - ([#128](https://github.com/Originate/git-town/issues/128), - [75f498](https://github.com/Originate/git-town/commit/75f498771f19326f03bd1fd1bb70c9d9851b53f3)) + ([#128](https://github.com/git-town/git-town/issues/128), + [75f498](https://github.com/git-town/git-town/commit/75f498771f19326f03bd1fd1bb70c9d9851b53f3)) - **git sync-fork:** no longer automatically sets upstream configuration - ([865030](https://github.com/Originate/git-town/commit/8650301a3ea40a989562a991960fa0d41b26f7f7)) + ([865030](https://github.com/git-town/git-town/commit/8650301a3ea40a989562a991960fa0d41b26f7f7)) - remove needless checkouts for **git-ship**, **git-extract**, and **git-hack** - ([#150](https://github.com/Originate/git-town/issues/150), - [#155](https://github.com/Originate/git-town/issues/155), - [8b385a](https://github.com/Originate/git-town/commit/8b385a745cf7ed28638e0a5c9c24440b7010354c), - [35de43](https://github.com/Originate/git-town/commit/35de43156d9c6092840cd73456844b90acc36d8e)) + ([#150](https://github.com/git-town/git-town/issues/150), + [#155](https://github.com/git-town/git-town/issues/155), + [8b385a](https://github.com/git-town/git-town/commit/8b385a745cf7ed28638e0a5c9c24440b7010354c), + [35de43](https://github.com/git-town/git-town/commit/35de43156d9c6092840cd73456844b90acc36d8e)) - linters for shell scripts and ruby tests - ([#149](https://github.com/Originate/git-town/issues/149), - [076668](https://github.com/Originate/git-town/commit/07666825b5d60e15de274746fc3c26f72bd7aee2), - [651c04](https://github.com/Originate/git-town/commit/651c0448309a376eee7d35659d8b06f709b113b5)) + ([#149](https://github.com/git-town/git-town/issues/149), + [076668](https://github.com/git-town/git-town/commit/07666825b5d60e15de274746fc3c26f72bd7aee2), + [651c04](https://github.com/git-town/git-town/commit/651c0448309a376eee7d35659d8b06f709b113b5)) - rake tasks for development - ([#170](https://github.com/Originate/git-town/issues/170), - [ba74cf](https://github.com/Originate/git-town/commit/ba74cf30c8001941769dcd70410dbd18331f2fe9)) + ([#170](https://github.com/git-town/git-town/issues/170), + [ba74cf](https://github.com/git-town/git-town/commit/ba74cf30c8001941769dcd70410dbd18331f2fe9)) ## 0.4.0 (2014-11-13) - **git kill:** completely removes a feature branch - ([#87](https://github.com/Originate/git-town/issues/87), - [edd7d8](https://github.com/Originate/git-town/commit/edd7d8180eb76717fd72e77d2c75edf8e3b6b6ca)) + ([#87](https://github.com/git-town/git-town/issues/87), + [edd7d8](https://github.com/git-town/git-town/commit/edd7d8180eb76717fd72e77d2c75edf8e3b6b6ca)) - **git sync:** pushes tags to the remote when running on the main branch - ([#68](https://github.com/Originate/git-town/issues/68), - [71b607](https://github.com/Originate/git-town/commit/71b607988c00e6dfc8f2598e9b964cc2ed4cfc39)) + ([#68](https://github.com/git-town/git-town/issues/68), + [71b607](https://github.com/git-town/git-town/commit/71b607988c00e6dfc8f2598e9b964cc2ed4cfc39)) - **non-feature branches:** cannot be shipped and do not merge main when syncing - ([#45](https://github.com/Originate/git-town/issues/45), - [31dce1](https://github.com/Originate/git-town/commit/31dce1dfaf11e1e17f17e141a26cb38360ab731a)) + ([#45](https://github.com/git-town/git-town/issues/45), + [31dce1](https://github.com/git-town/git-town/commit/31dce1dfaf11e1e17f17e141a26cb38360ab731a)) - **git ship:** - merges main into the feature branch before squash merging - ([#61](https://github.com/Originate/git-town/issues/61), - [82d4d3](https://github.com/Originate/git-town/commit/82d4d3e745732cb397850a4c047826ba485e2bdb)) + ([#61](https://github.com/git-town/git-town/issues/61), + [82d4d3](https://github.com/git-town/git-town/commit/82d4d3e745732cb397850a4c047826ba485e2bdb)) - errors if the feature branch is not ahead of main - ([#86](https://github.com/Originate/git-town/issues/86), - [a0ace5](https://github.com/Originate/git-town/commit/a0ace5bb5e992c193df8abe4b0aca984c302c323)) + ([#86](https://github.com/git-town/git-town/issues/86), + [a0ace5](https://github.com/git-town/git-town/commit/a0ace5bb5e992c193df8abe4b0aca984c302c323)) - git ship takes an optional branch name - ([#95](https://github.com/Originate/git-town/issues/95), - [cbf020](https://github.com/Originate/git-town/commit/cbf020fc3dd6d0ce49f8814a92f103e243f9cd2b)) + ([#95](https://github.com/git-town/git-town/issues/95), + [cbf020](https://github.com/git-town/git-town/commit/cbf020fc3dd6d0ce49f8814a92f103e243f9cd2b)) - updated output to show each git command and its output, updated error messages - ([8d8973](https://github.com/Originate/git-town/commit/8d8973aaa58394a123ceed2811271606f4e1aaa9), - [60e1d8](https://github.com/Originate/git-town/commit/60e1d8299ebbb0e75bdae057e864d17e1f9a3ce7), - [408e69](https://github.com/Originate/git-town/commit/408e699e5bdd3af524b2ea64669b81fea3bbe60b)) + ([8d8973](https://github.com/git-town/git-town/commit/8d8973aaa58394a123ceed2811271606f4e1aaa9), + [60e1d8](https://github.com/git-town/git-town/commit/60e1d8299ebbb0e75bdae057e864d17e1f9a3ce7), + [408e69](https://github.com/git-town/git-town/commit/408e699e5bdd3af524b2ea64669b81fea3bbe60b)) - skips unnecessary pushes - ([0da896](https://github.com/Originate/git-town/commit/0da8968aef29f9ecb7326e0fafb5976f51789dca)) + ([0da896](https://github.com/git-town/git-town/commit/0da8968aef29f9ecb7326e0fafb5976f51789dca)) - **man pages** - ([609e11](https://github.com/Originate/git-town/commit/609e11400818604328885df86c02ee4630410e12), - [164f06](https://github.com/Originate/git-town/commit/164f06bc8bf00d9e99ce0416f408cf62959dc833), - [27b257](https://github.com/Originate/git-town/commit/27b2573ca5ffa9ae7930f8b5999bbfdd72bd16d9)) -- **git prune-branches** - ([#48](https://github.com/Originate/git-town/issues/48), - [7a922e](https://github.com/Originate/git-town/commit/7a922ecd9e03d20ed5a0c159022e601cebc80313)) + ([609e11](https://github.com/git-town/git-town/commit/609e11400818604328885df86c02ee4630410e12), + [164f06](https://github.com/git-town/git-town/commit/164f06bc8bf00d9e99ce0416f408cf62959dc833), + [27b257](https://github.com/git-town/git-town/commit/27b2573ca5ffa9ae7930f8b5999bbfdd72bd16d9)) +- **git prune-branches** ([#48](https://github.com/git-town/git-town/issues/48), + [7a922e](https://github.com/git-town/git-town/commit/7a922ecd9e03d20ed5a0c159022e601cebc80313)) - **Cucumber:** optional Fuubar output - ([7c5402](https://github.com/Originate/git-town/commit/7c540284cf46bd49a7623566c1343285813524c6)) + ([7c5402](https://github.com/git-town/git-town/commit/7c540284cf46bd49a7623566c1343285813524c6)) ## 0.3 (2014-10-10) - multi-user support for feature branches - ([#35](https://github.com/Originate/git-town/issues/35), - [ca0882](https://github.com/Originate/git-town/commit/ca08820c68457bddf6b8fff6c3ef3d430b905d9b)) -- **git sync-fork** ([#22](https://github.com/Originate/git-town/issues/22), - [1f1f9f](https://github.com/Originate/git-town/commit/1f1f9f98ffa7288d6a5982ec0c9e571695590fe1)) + ([#35](https://github.com/git-town/git-town/issues/35), + [ca0882](https://github.com/git-town/git-town/commit/ca08820c68457bddf6b8fff6c3ef3d430b905d9b)) +- **git sync-fork** ([#22](https://github.com/git-town/git-town/issues/22), + [1f1f9f](https://github.com/git-town/git-town/commit/1f1f9f98ffa7288d6a5982ec0c9e571695590fe1)) - stores configuration in the Git configuration instead of a dedicated file - ([8b8695](https://github.com/Originate/git-town/commit/8b86953d7c7c719f28dbc7af6e86d02adaf2053e)) + ([8b8695](https://github.com/git-town/git-town/commit/8b86953d7c7c719f28dbc7af6e86d02adaf2053e)) - only makes one fetch from the central repo per session - ([#15](https://github.com/Originate/git-town/issues/15), - [43400a](https://github.com/Originate/git-town/commit/43400a5b968a47eb55484f73e34026f66b1e939a)) + ([#15](https://github.com/git-town/git-town/issues/15), + [43400a](https://github.com/git-town/git-town/commit/43400a5b968a47eb55484f73e34026f66b1e939a)) - automatically prunes remote branches when fetching updates - ([86100f](https://github.com/Originate/git-town/commit/86100f08866f19a0f4e80f470fe8dcc6996ddc2c)) + ([86100f](https://github.com/git-town/git-town/commit/86100f08866f19a0f4e80f470fe8dcc6996ddc2c)) - always cleans up abort and continue scripts after using one of them - ([3be4c0](https://github.com/Originate/git-town/commit/3be4c06635a943f378287963ba30e4306fcd9802)) + ([3be4c0](https://github.com/git-town/git-town/commit/3be4c06635a943f378287963ba30e4306fcd9802)) - simpler readme, dedicated RDD document - **Cucumber** feature specs (you need Ruby 2.x) - ([c9d175](https://github.com/Originate/git-town/commit/c9d175fe2f28fbda3f662454f54ed80306ce2f46)) + ([c9d175](https://github.com/git-town/git-town/commit/c9d175fe2f28fbda3f662454f54ed80306ce2f46)) - much faster testing thanks to completely local test Git repos - ([#25](https://github.com/Originate/git-town/issues/25), - [c9d175](https://github.com/Originate/git-town/commit/c9d175fe2f28fbda3f662454f54ed80306ce2f46)) + ([#25](https://github.com/git-town/git-town/issues/25), + [c9d175](https://github.com/git-town/git-town/commit/c9d175fe2f28fbda3f662454f54ed80306ce2f46)) ## 0.2.2 (2014-06-10) diff --git a/doc.go b/doc.go index b174ed81c49..70b1d02e0b5 100644 --- a/doc.go +++ b/doc.go @@ -8,13 +8,13 @@ Git Flow, the Nvie model, GitLab Flow, and other workflows more directly, and it allows you to perform many common Git operations faster and easier. -More information at https://github.com/Originate/git-town. +More information at https://github.com/git-town/git-town. Installation alternatives: - HomeBrew (macOS): brew install git-town - AUR package for Arch Linux: https://aur.archlinux.org/packages/git-town - - go get github.com/Originate/git-town - - direct download of platform-specific binaries: https://github.com/Originate/git-town/releases/latest + - go get github.com/git-town/git-town + - direct download of platform-specific binaries: https://github.com/git-town/git-town/releases/latest Available commands and usage: git town help diff --git a/documentation/development/testing.md b/documentation/development/testing.md index 97fe425d2d2..0c535885c96 100644 --- a/documentation/development/testing.md +++ b/documentation/development/testing.md @@ -29,7 +29,7 @@ make cuke [cucumber parameters] make fix ``` -Git Town's [CI server](https://circleci.com/gh/Originate/git-town) automatically +Git Town's [CI server](https://circleci.com/gh/git-town/git-town) automatically tests all commits and pull requests, and notifies you via email and through status badges in pull requests about problems. @@ -79,4 +79,4 @@ requires an environment variable `GIT_TOWN_ENV` to be set to `test`. ## Auto-running tests The Git Town code base works with -[Tertestrial](https://github.com/Originate/tertestrial-server). +[Tertestrial](https://github.com/git-town/tertestrial-server). diff --git a/features/git-town-new-pull-request/bitbucket.feature b/features/git-town-new-pull-request/bitbucket.feature index 2108bdc9ff7..aa1cf064cae 100644 --- a/features/git-town-new-pull-request/bitbucket.feature +++ b/features/git-town-new-pull-request/bitbucket.feature @@ -11,54 +11,54 @@ Feature: git-new-pull-request when origin is on Bitbucket And I have "open" installed And I am on the "feature" branch When I run `git-town new-pull-request` - Then I see a new pull request with this url in my browser: - """ - https://bitbucket.org/Originate/git-town/pull-request/new?dest=Originate%2Fgit-town%3A%3Amain&source=Originate%2Fgit-town%.*%3Afeature - """ + Then I see a new pull request with this url in my browser: + """ + https://bitbucket.org/git-town/git-town/pull-request/new?dest=git-town%2Fgit-town%3A%3Amain&source=git-town%2Fgit-town%.*%3Afeature + """ Examples: - | ORIGIN | - | http://username@bitbucket.org/Originate/git-town.git | - | http://username@bitbucket.org/Originate/git-town | - | https://username@bitbucket.org/Originate/git-town.git | - | https://username@bitbucket.org/Originate/git-town | - | git@bitbucket.org/Originate/git-town.git | - | git@bitbucket.org/Originate/git-town | + | ORIGIN | + | http://username@bitbucket.org/git-town/git-town.git | + | http://username@bitbucket.org/git-town/git-town | + | https://username@bitbucket.org/git-town/git-town.git | + | https://username@bitbucket.org/git-town/git-town | + | git@bitbucket.org/git-town/git-town.git | + | git@bitbucket.org/git-town/git-town | - Scenario Outline: origin includes path that looks like a URL + Scenario Outline: origin includes path that looks like a URL Given my repository has a feature branch named "feature" And my repo's remote origin is And I have "open" installed And I am on the "feature" branch When I run `git-town new-pull-request` - Then I see a new pull request with this url in my browser: - """ - https://bitbucket.org/Originate/originate.github.com/pull-request/new?dest=Originate%2Foriginate.github.com%3A%3Amain&source=Originate%2Foriginate.github.com%.*%3Afeature - """ + Then I see a new pull request with this url in my browser: + """ + https://bitbucket.org/git-town/git-town.github.com/pull-request/new?dest=git-town%2Fgit-town.github.com%3A%3Amain&source=git-town%2Fgit-town.github.com%.*%3Afeature + """ - Examples: - | ORIGIN | - | http://username@bitbucket.org/Originate/originate.github.com.git | - | http://username@bitbucket.org/Originate/originate.github.com | - | https://username@bitbucket.org/Originate/originate.github.com.git | - | https://username@bitbucket.org/Originate/originate.github.com | - | git@bitbucket.org/Originate/originate.github.com.git | - | git@bitbucket.org/Originate/originate.github.com | + Examples: + | ORIGIN | + | http://username@bitbucket.org/git-town/git-town.github.com.git | + | http://username@bitbucket.org/git-town/git-town.github.com | + | https://username@bitbucket.org/git-town/git-town.github.com.git | + | https://username@bitbucket.org/git-town/git-town.github.com | + | git@bitbucket.org/git-town/git-town.github.com.git | + | git@bitbucket.org/git-town/git-town.github.com | - Scenario Outline: SSH style origin + Scenario Outline: SSH style origin Given my repository has a feature branch named "feature" And my repo's remote origin is And I have "open" installed And I am on the "feature" branch When I run `git-town new-pull-request` - Then I see a new pull request with this url in my browser: - """ - https://bitbucket.org/Originate/git-town/pull-request/new?dest=Originate%2Fgit-town%3A%3Amain&source=Originate%2Fgit-town%.*%3Afeature - """ + Then I see a new pull request with this url in my browser: + """ + https://bitbucket.org/git-town/git-town/pull-request/new?dest=git-town%2Fgit-town%3A%3Amain&source=git-town%2Fgit-town%.*%3Afeature + """ - Examples: - | ORIGIN | - | ssh://git@bitbucket.org/Originate/git-town.git | - | ssh://git@bitbucket.org/Originate/git-town | + Examples: + | ORIGIN | + | ssh://git@bitbucket.org/git-town/git-town.git | + | ssh://git@bitbucket.org/git-town/git-town | diff --git a/features/git-town-new-pull-request/conflict.feature b/features/git-town-new-pull-request/conflict.feature index de03865df1d..4a24fc30a3b 100644 --- a/features/git-town-new-pull-request/conflict.feature +++ b/features/git-town-new-pull-request/conflict.feature @@ -12,7 +12,7 @@ Feature: Syncing before creating the pull request | main | local and remote | main commit | conflicting_file | main_content | | feature | local | feature commit | conflicting_file | feature content | And I have "open" installed - And my repo's remote origin is git@github.com:Originate/git-town.git + And my repo's remote origin is git@github.com:git-town/git-town.git And I am on the "feature" branch And my workspace has an uncommitted file When I run `git-town new-pull-request` @@ -68,12 +68,12 @@ Feature: Syncing before creating the pull request Given I resolve the conflict in "conflicting_file" When I run `git-town continue` Then it runs the commands - | BRANCH | COMMAND | - | feature | git commit --no-edit | - | | git push | - | | git stash pop | - | | open https://github.com/Originate/git-town/compare/feature?expand=1 | - And I see a new GitHub pull request for the "feature" branch in the "Originate/git-town" repo in my browser + | BRANCH | COMMAND | + | feature | git commit --no-edit | + | | git push | + | | git stash pop | + | | open https://github.com/git-town/git-town/compare/feature?expand=1 | + And I see a new GitHub pull request for the "feature" branch in the "git-town/git-town" repo in my browser And I am still on the "feature" branch And my workspace still contains my uncommitted file And my repository has the following commits @@ -88,11 +88,11 @@ Feature: Syncing before creating the pull request Given I resolve the conflict in "conflicting_file" When I run `git commit --no-edit; git-town continue` Then it runs the commands - | BRANCH | COMMAND | - | feature | git push | - | | git stash pop | - | | open https://github.com/Originate/git-town/compare/feature?expand=1 | - And I see a new GitHub pull request for the "feature" branch in the "Originate/git-town" repo in my browser + | BRANCH | COMMAND | + | feature | git push | + | | git stash pop | + | | open https://github.com/git-town/git-town/compare/feature?expand=1 | + And I see a new GitHub pull request for the "feature" branch in the "git-town/git-town" repo in my browser And I am still on the "feature" branch And my workspace still contains my uncommitted file And my repository has the following commits diff --git a/features/git-town-new-pull-request/github.feature b/features/git-town-new-pull-request/github.feature index 581aae8b0d1..080544d8619 100644 --- a/features/git-town-new-pull-request/github.feature +++ b/features/git-town-new-pull-request/github.feature @@ -14,19 +14,19 @@ Feature: git-new-pull-request when origin is on GitHub And my repo's remote origin is And I am on the "feature" branch When I run `git-town new-pull-request` - Then I see a new pull request with this url in my browser: - """ - https://github.com/Originate/git-town/compare/feature?expand=1 - """ + Then I see a new pull request with this url in my browser: + """ + https://github.com/git-town/git-town/compare/feature?expand=1 + """ Examples: - | ORIGIN | - | http://github.com/Originate/git-town.git | - | http://github.com/Originate/git-town | - | https://github.com/Originate/git-town.git | - | https://github.com/Originate/git-town | - | git@github.com:Originate/git-town.git | - | git@github.com:Originate/git-town | + | ORIGIN | + | http://github.com/git-town/git-town.git | + | http://github.com/git-town/git-town | + | https://github.com/git-town/git-town.git | + | https://github.com/git-town/git-town | + | git@github.com:git-town/git-town.git | + | git@github.com:git-town/git-town | Scenario Outline: origin contains path that looks like a URL @@ -34,24 +34,24 @@ Feature: git-new-pull-request when origin is on GitHub And my repo's remote origin is And I am on the "feature" branch When I run `git-town new-pull-request` - Then I see a new pull request with this url in my browser: - """ - https://github.com/Originate/originate.github.com/compare/feature?expand=1 | - """ + Then I see a new pull request with this url in my browser: + """ + https://github.com/git-town/git-town.github.com/compare/feature?expand=1 | + """ - Examples: - | ORIGIN | - | http://github.com/Originate/originate.github.com.git | - | http://github.com/Originate/originate.github.com | - | https://github.com/Originate/originate.github.com.git | - | https://github.com/Originate/originate.github.com | - | git@github.com:Originate/originate.github.com.git | - | git@github.com:Originate/originate.github.com | + Examples: + | ORIGIN | + | http://github.com/git-town/git-town.github.com.git | + | http://github.com/git-town/git-town.github.com | + | https://github.com/git-town/git-town.github.com.git | + | https://github.com/git-town/git-town.github.com | + | git@github.com:git-town/git-town.github.com.git | + | git@github.com:git-town/git-town.github.com | Scenario Outline: proper URL encoding Given my repository has a feature branch named "" - And my repo's remote origin is "https://github.com/Originate/git-town" + And my repo's remote origin is "https://github.com/git-town/git-town" And I am on the "" branch When I run `git-town new-pull-request` Then I see a new pull request with this url in my browser: @@ -60,11 +60,11 @@ Feature: git-new-pull-request when origin is on GitHub """ Examples: - | BRANCH_NAME | URL | - | feature-branch | https://github.com/Originate/git-town/compare/feature-branch?expand=1 | - | feature_branch | https://github.com/Originate/git-town/compare/feature_branch?expand=1 | - | fix-#2 | https://github.com/Originate/git-town/compare/fix-%232?expand=1 | - | test/feature | https://github.com/Originate/git-town/compare/test%2Ffeature?expand=1 | + | BRANCH_NAME | URL | + | feature-branch | https://github.com/git-town/git-town/compare/feature-branch?expand=1 | + | feature_branch | https://github.com/git-town/git-town/compare/feature_branch?expand=1 | + | fix-#2 | https://github.com/git-town/git-town/compare/fix-%232?expand=1 | + | test/feature | https://github.com/git-town/git-town/compare/test%2Ffeature?expand=1 | Scenario Outline: SSH style origin @@ -72,21 +72,21 @@ Feature: git-new-pull-request when origin is on GitHub And my repo's remote origin is And I am on the "feature" branch When I run `git-town new-pull-request` - Then I see a new pull request with this url in my browser: - """ - https://github.com/Originate/git-town/compare/feature?expand=1 - """ + Then I see a new pull request with this url in my browser: + """ + https://github.com/git-town/git-town/compare/feature?expand=1 + """ - Examples: - | ORIGIN | - | ssh://git@github.com/Originate/git-town.git | - | ssh://git@github.com/Originate/git-town | + Examples: + | ORIGIN | + | ssh://git@github.com/git-town/git-town.git | + | ssh://git@github.com/git-town/git-town | Scenario: nested feature branch with known parent Given my repository has a feature branch named "parent-feature" And my repository has a feature branch named "child-feature" as a child of "parent-feature" - And my repo's remote origin is git@github.com:Originate/git-town.git + And my repo's remote origin is git@github.com:git-town/git-town.git And I am on the "child-feature" branch When I run `git-town new-pull-request` - Then I see a new GitHub pull request for the "child-feature" branch against the "parent-feature" branch in the "Originate/git-town" repo in my browser + Then I see a new GitHub pull request for the "child-feature" branch against the "parent-feature" branch in the "git-town/git-town" repo in my browser diff --git a/features/git-town-new-pull-request/multi_platform_support.feature b/features/git-town-new-pull-request/multi_platform_support.feature index fc1e1e7cb95..4e4531e090a 100644 --- a/features/git-town-new-pull-request/multi_platform_support.feature +++ b/features/git-town-new-pull-request/multi_platform_support.feature @@ -2,11 +2,11 @@ Feature: git-new-pull-request: multi-platform support Scenario Outline: supported tool installed Given my repository has a feature branch named "feature" - And my repo's remote origin is https://github.com/Originate/git-town.git + And my repo's remote origin is https://github.com/git-town/git-town.git And I have "" installed And I am on the "feature" branch When I run `git-town new-pull-request` - Then I see a new GitHub pull request for the "feature" branch in the "Originate/git-town" repo in my browser + Then I see a new GitHub pull request for the "feature" branch in the "git-town/git-town" repo in my browser Examples: | TOOL | @@ -22,7 +22,7 @@ Feature: git-new-pull-request: multi-platform support Scenario: no supported tool installed Given my repository has a feature branch named "feature" - And my repo's remote origin is https://github.com/Originate/git-town.git + And my repo's remote origin is https://github.com/git-town/git-town.git And I have no command that opens browsers installed And I am on the "feature" branch When I run `git-town new-pull-request` diff --git a/features/git-town-new-pull-request/on_outdated_branch.feature b/features/git-town-new-pull-request/on_outdated_branch.feature index b5a87b86461..e07b6b41e0f 100644 --- a/features/git-town-new-pull-request/on_outdated_branch.feature +++ b/features/git-town-new-pull-request/on_outdated_branch.feature @@ -17,7 +17,7 @@ Feature: Syncing before creating the pull request | child-feature | local | local child commit | local_child_file | | | remote | remote child commit | remote_child_file | And I have "open" installed - And my repo's remote origin is git@github.com:Originate/git-town.git + And my repo's remote origin is git@github.com:git-town/git-town.git And I am on the "child-feature" branch And my workspace has an uncommitted file When I run `git-town new-pull-request` @@ -25,24 +25,24 @@ Feature: Syncing before creating the pull request Scenario: result Then it runs the commands - | BRANCH | COMMAND | - | child-feature | git fetch --prune --tags | - | | git add -A | - | | git stash | - | | git checkout main | - | main | git rebase origin/main | - | | git push | - | | git checkout parent-feature | - | parent-feature | git merge --no-edit origin/parent-feature | - | | git merge --no-edit main | - | | git push | - | | git checkout child-feature | - | child-feature | git merge --no-edit origin/child-feature | - | | git merge --no-edit parent-feature | - | | git push | - | | git stash pop | - | | open https://github.com/Originate/git-town/compare/parent-feature...child-feature?expand=1 | - And I see a new GitHub pull request for the "child-feature" branch against the "parent-feature" branch in the "Originate/git-town" repo in my browser + | BRANCH | COMMAND | + | child-feature | git fetch --prune --tags | + | | git add -A | + | | git stash | + | | git checkout main | + | main | git rebase origin/main | + | | git push | + | | git checkout parent-feature | + | parent-feature | git merge --no-edit origin/parent-feature | + | | git merge --no-edit main | + | | git push | + | | git checkout child-feature | + | child-feature | git merge --no-edit origin/child-feature | + | | git merge --no-edit parent-feature | + | | git push | + | | git stash pop | + | | open https://github.com/git-town/git-town/compare/parent-feature...child-feature?expand=1 | + And I see a new GitHub pull request for the "child-feature" branch against the "parent-feature" branch in the "git-town/git-town" repo in my browser And I am still on the "child-feature" branch And my workspace still contains my uncommitted file And my repository has the following commits diff --git a/features/git-town-new-pull-request/self_hosted.feature b/features/git-town-new-pull-request/self_hosted.feature index a691445c80c..dd11c78b737 100644 --- a/features/git-town-new-pull-request/self_hosted.feature +++ b/features/git-town-new-pull-request/self_hosted.feature @@ -1,6 +1,6 @@ Feature: git-town new-pull-request: when origin is a self hosted servie - When creating a pull request on a self-hosted repository whose type cannot be derived from its URL + When creating a pull request on a self-hosted repository whose type cannot be derived from its URL I want to specify the type of the hosted repository So that Git Town can support specific features of my repository platform. @@ -8,7 +8,7 @@ Feature: git-town new-pull-request: when origin is a self hosted servie Scenario Outline: self hosted Given I have "open" installed And my repository has a feature branch named "feature" - And my repo's remote origin is "git@self-hosted:Originate/git-town.git" + And my repo's remote origin is "git@self-hosted:git-town/git-town.git" And I configure "git-town.code-hosting-driver" as "" And I am on the "feature" branch When I run `git-town new-pull-request` @@ -18,7 +18,7 @@ Feature: git-town new-pull-request: when origin is a self hosted servie """ Examples: - | DRIVER | PULL_REQUEST_URL | - | bitbucket | https://self-hosted/Originate/git-town/pull-request/new?dest=Originate%2Fgit-town%3A%3Amain&source=Originate%2Fgit-town%.*%3Afeature | - | github | https://self-hosted/Originate/git-town/compare/feature?expand=1 | - | gitlab | https://self-hosted/Originate/git-town/merge_requests/new?merge_request%5Bsource_branch%5D=feature&merge_request%5Btarget_branch%5D=main | + | DRIVER | PULL_REQUEST_URL | + | bitbucket | https://self-hosted/git-town/git-town/pull-request/new?dest=git-town%2Fgit-town%3A%3Amain&source=git-town%2Fgit-town%.*%3Afeature | + | github | https://self-hosted/git-town/git-town/compare/feature?expand=1 | + | gitlab | https://self-hosted/git-town/git-town/merge_requests/new?merge_request%5Bsource_branch%5D=feature&merge_request%5Btarget_branch%5D=main | diff --git a/features/git-town-new-pull-request/ssh_identity.feature b/features/git-town-new-pull-request/ssh_identity.feature index ec56afb0a42..23ba0140cfa 100644 --- a/features/git-town-new-pull-request/ssh_identity.feature +++ b/features/git-town-new-pull-request/ssh_identity.feature @@ -1,6 +1,6 @@ Feature: git-town new-pull-request: when origin is an ssh identity - When using my Git server via an SSH identity + When using my Git server via an SSH identity I want to be able to configure git town with the code hosting driver and origin hostname it should use So that new-pull-request works with my ssh identity @@ -8,7 +8,7 @@ Feature: git-town new-pull-request: when origin is an ssh identity Scenario Outline: ssh identity Given I have "open" installed And my repository has a feature branch named "feature" - And my repo's remote origin is "git@my-ssh-identity:Originate/git-town.git" + And my repo's remote origin is "git@my-ssh-identity:git-town/git-town.git" And I configure "git-town.code-hosting-origin-hostname" as "" And I am on the "feature" branch When I run `git-town new-pull-request` @@ -18,7 +18,7 @@ Feature: git-town new-pull-request: when origin is an ssh identity """ Examples: - | ORIGIN_HOSTNAME | PULL_REQUEST_URL | - | bitbucket.org | https://bitbucket.org/Originate/git-town/pull-request/new?dest=Originate%2Fgit-town%3A%3Amain&source=Originate%2Fgit-town%.*%3Afeature | - | github.com | https://github.com/Originate/git-town/compare/feature?expand=1 | - | gitlab.com | https://gitlab.com/Originate/git-town/merge_requests/new?merge_request%5Bsource_branch%5D=feature&merge_request%5Btarget_branch%5D=main | + | ORIGIN_HOSTNAME | PULL_REQUEST_URL | + | bitbucket.org | https://bitbucket.org/git-town/git-town/pull-request/new?dest=git-town%2Fgit-town%3A%3Amain&source=git-town%2Fgit-town%.*%3Afeature | + | github.com | https://github.com/git-town/git-town/compare/feature?expand=1 | + | gitlab.com | https://gitlab.com/git-town/git-town/merge_requests/new?merge_request%5Bsource_branch%5D=feature&merge_request%5Btarget_branch%5D=main | diff --git a/features/git-town-repo/bitbucket.feature b/features/git-town-repo/bitbucket.feature index 13afe34552f..e1c4783ca41 100644 --- a/features/git-town-repo/bitbucket.feature +++ b/features/git-town-repo/bitbucket.feature @@ -4,15 +4,15 @@ Feature: git-repo when origin is on Bitbucket Given my repo's remote origin is And I have "open" installed When I run `git-town repo` - Then I see the Bitbucket homepage of the "Originate/git-town" repository in my browser + Then I see the Bitbucket homepage of the "git-town/git-town" repository in my browser Examples: - | ORIGIN | - | http://username@bitbucket.org/Originate/git-town.git | - | http://username@bitbucket.org/Originate/git-town | - | https://username@bitbucket.org/Originate/git-town.git | - | https://username@bitbucket.org/Originate/git-town | - | git@bitbucket.org/Originate/git-town.git | - | git@bitbucket.org/Originate/git-town | - | ssh://git@bitbucket.org/Originate/git-town.git | - | ssh://git@bitbucket.org/Originate/git-town | + | ORIGIN | + | http://username@bitbucket.org/git-town/git-town.git | + | http://username@bitbucket.org/git-town/git-town | + | https://username@bitbucket.org/git-town/git-town.git | + | https://username@bitbucket.org/git-town/git-town | + | git@bitbucket.org/git-town/git-town.git | + | git@bitbucket.org/git-town/git-town | + | ssh://git@bitbucket.org/git-town/git-town.git | + | ssh://git@bitbucket.org/git-town/git-town | diff --git a/features/git-town-repo/github.feature b/features/git-town-repo/github.feature index a1635d1dadb..7f90d7da7f5 100644 --- a/features/git-town-repo/github.feature +++ b/features/git-town-repo/github.feature @@ -4,15 +4,15 @@ Feature: git-repo when origin is on GitHub Given my repo's remote origin is And I have "open" installed When I run `git-town repo` - Then I see the GitHub homepage of the "Originate/git-town" repository in my browser + Then I see the GitHub homepage of the "git-town/git-town" repository in my browser Examples: - | ORIGIN | - | http://github.com/Originate/git-town.git | - | http://github.com/Originate/git-town | - | https://github.com/Originate/git-town.git | - | https://github.com/Originate/git-town | - | git@github.com:Originate/git-town.git | - | git@github.com:Originate/git-town | - | ssh://git@github.com/Originate/git-town.git | - | ssh://git@github.com/Originate/git-town | + | ORIGIN | + | http://github.com/git-town/git-town.git | + | http://github.com/git-town/git-town | + | https://github.com/git-town/git-town.git | + | https://github.com/git-town/git-town | + | git@github.com:git-town/git-town.git | + | git@github.com:git-town/git-town | + | ssh://git@github.com/git-town/git-town.git | + | ssh://git@github.com/git-town/git-town | diff --git a/features/git-town-repo/multi_platform_support.feature b/features/git-town-repo/multi_platform_support.feature index b269b503c81..b1256538164 100644 --- a/features/git-town-repo/multi_platform_support.feature +++ b/features/git-town-repo/multi_platform_support.feature @@ -1,10 +1,10 @@ Feature: git-repo: multi-platform support Scenario Outline: supported tool installed - Given my repo's remote origin is https://github.com/Originate/git-town.git + Given my repo's remote origin is https://github.com/git-town/git-town.git And I have "" installed When I run `git-town repo` - Then I see the GitHub homepage of the "Originate/git-town" repository in my browser + Then I see the GitHub homepage of the "git-town/git-town" repository in my browser Examples: | TOOL | @@ -13,7 +13,7 @@ Feature: git-repo: multi-platform support Scenario: no supported tool installed - Given my repo's remote origin is https://github.com/Originate/git-town.git + Given my repo's remote origin is https://github.com/git-town/git-town.git And I have no command that opens browsers installed When I run `git-town repo` Then it prints the error "Cannot open a browser" diff --git a/features/git-town-repo/self_hosted.feature b/features/git-town-repo/self_hosted.feature index dd73ecfd274..92a6142dabb 100644 --- a/features/git-town-repo/self_hosted.feature +++ b/features/git-town-repo/self_hosted.feature @@ -2,7 +2,7 @@ Feature: git-town repo: when origin is a self hosted servie Scenario Outline: self hosted Given I have "open" installed - And my repo's remote origin is "git@self-hosted:Originate/git-town.git" + And my repo's remote origin is "git@self-hosted:git-town/git-town.git" And I configure "git-town.code-hosting-driver" as "" When I run `git-town repo` Then I see my repo homepage this url in my browser: @@ -11,7 +11,7 @@ Feature: git-town repo: when origin is a self hosted servie """ Examples: - | DRIVER | REPO_URL | - | bitbucket | https://self-hosted/Originate/git-town | - | github | https://self-hosted/Originate/git-town | - | gitlab | https://self-hosted/Originate/git-town | + | DRIVER | REPO_URL | + | bitbucket | https://self-hosted/git-town/git-town | + | github | https://self-hosted/git-town/git-town | + | gitlab | https://self-hosted/git-town/git-town | diff --git a/features/git-town-repo/ssh_identity.feature b/features/git-town-repo/ssh_identity.feature index fd6d75f44df..21defd74472 100644 --- a/features/git-town-repo/ssh_identity.feature +++ b/features/git-town-repo/ssh_identity.feature @@ -2,7 +2,7 @@ Feature: git-town repo: when origin is an ssh identity Scenario Outline: ssh identity Given I have "open" installed - And my repo's remote origin is "git@my-ssh-identity:Originate/git-town.git" + And my repo's remote origin is "git@my-ssh-identity:git-town/git-town.git" And I configure "git-town.code-hosting-origin-hostname" as "" When I run `git-town repo` Then I see my repo homepage this url in my browser: @@ -11,7 +11,7 @@ Feature: git-town repo: when origin is an ssh identity """ Examples: - | ORIGIN_HOSTNAME | REPO_URL | - | bitbucket.org | https://bitbucket.org/Originate/git-town | - | github.com | https://github.com/Originate/git-town | - | gitlab.com | https://gitlab.com/Originate/git-town | + | ORIGIN_HOSTNAME | REPO_URL | + | bitbucket.org | https://bitbucket.org/git-town/git-town | + | github.com | https://github.com/git-town/git-town | + | gitlab.com | https://gitlab.com/git-town/git-town | diff --git a/features/shared/checkout_previous_branch_after_success/current_branch_same/previous_branch_same.feature b/features/shared/checkout_previous_branch_after_success/current_branch_same/previous_branch_same.feature index 5e0522c43a0..362eba47e4b 100644 --- a/features/shared/checkout_previous_branch_after_success/current_branch_same/previous_branch_same.feature +++ b/features/shared/checkout_previous_branch_after_success/current_branch_same/previous_branch_same.feature @@ -16,7 +16,7 @@ Feature: Git checkout history is preserved when the current and previous branch Scenario: new-pull-request Given my repository has the feature branches "previous" and "current" And I have "open" installed - And my repo's remote origin is "https://github.com/Originate/git-town.git" + And my repo's remote origin is "https://github.com/git-town/git-town.git" And I am on the "current" branch with "previous" as the previous Git branch When I run `git-town new-pull-request` Then I am still on the "current" branch @@ -38,7 +38,7 @@ Feature: Git checkout history is preserved when the current and previous branch Scenario: repo Given my repository has the feature branches "previous" and "current" And I have "open" installed - And my repo's remote origin is "https://github.com/Originate/git-town.git" + And my repo's remote origin is "https://github.com/git-town/git-town.git" And I am on the "current" branch with "previous" as the previous Git branch When I run `git-town repo` Then I am still on the "current" branch diff --git a/features/shared/prompting_for_parent_branch.feature b/features/shared/prompting_for_parent_branch.feature index 1d8435390cf..aad3399c5d0 100644 --- a/features/shared/prompting_for_parent_branch.feature +++ b/features/shared/prompting_for_parent_branch.feature @@ -48,12 +48,12 @@ Feature: Prompt for parent branch when unknown Given I have "open" installed And my repository has a feature branch named "feature" And Git Town has no branch hierarchy information for "feature" - And my repo's remote origin is git@github.com:Originate/git-town.git + And my repo's remote origin is git@github.com:git-town/git-town.git And I am on the "feature" branch When I run `git-town new-pull-request` and answer the prompts: | PROMPT | ANSWER | | Please specify the parent branch of 'feature' | [ENTER] | - Then I see a new GitHub pull request for the "feature" branch in the "Originate/git-town" repo in my browser + Then I see a new GitHub pull request for the "feature" branch in the "git-town/git-town" repo in my browser Scenario: prompting for parent branch when running git town-sync diff --git a/main.go b/main.go index 334a18f0e38..7c2905c9b5d 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,6 @@ package main -import "github.com/Originate/git-town/src/cmd" +import "github.com/git-town/git-town/src/cmd" func main() { cmd.Execute() diff --git a/main_test.go b/main_test.go index 23fbca7b7d9..ac2b775cb32 100644 --- a/main_test.go +++ b/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/Originate/git-town/test/steps" + "github.com/git-town/git-town/test/steps" "github.com/cucumber/godog" ) diff --git a/package/debian/debian/copyright b/package/debian/debian/copyright index 0894e236ee7..3ee6e310dfe 100644 --- a/package/debian/debian/copyright +++ b/package/debian/debian/copyright @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2015 Originate +Copyright (c) 2014-2015 the Git Town creators Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/package/debian/make_deb.sh b/package/debian/make_deb.sh index 4d652195401..866c3f85bc6 100755 --- a/package/debian/make_deb.sh +++ b/package/debian/make_deb.sh @@ -6,7 +6,7 @@ TIMESTAMP=$(date "+%a, %d %b %Y %H:%M:%S %z") cat << EOF > package/debian/debian/changelog gittown ($VER_NUM) RELEASED; urgency=low - * See https://github.com/Originate/git-town/releases for a complete changelog + * See https://github.com/git-town/git-town/releases for a complete changelog -- allonsy $TIMESTAMP EOF diff --git a/src/browsers/browsers.go b/src/browsers/browsers.go index 2606c0ee18c..33d9ba17ae8 100644 --- a/src/browsers/browsers.go +++ b/src/browsers/browsers.go @@ -3,8 +3,8 @@ package browsers import ( "runtime" - "github.com/Originate/git-town/src/command" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/command" + "github.com/git-town/git-town/src/util" ) // GetOpenBrowserCommand returns the command to run on the console @@ -41,6 +41,6 @@ var openBrowserCommands = []string{ var missingOpenBrowserCommandMessages = []string{ "Cannot open a browser.", "If you think this is a bug,", - "please open an issue at https://github.com/Originate/git-town/issues", + "please open an issue at https://github.com/git-town/git-town/issues", "and mention your OS and browser.", } diff --git a/src/cmd/abort.go b/src/cmd/abort.go index 6b3c2b95c4b..f5546404795 100644 --- a/src/cmd/abort.go +++ b/src/cmd/abort.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/alias.go b/src/cmd/alias.go index f3ef2ce01fb..2d183ab6aff 100644 --- a/src/cmd/alias.go +++ b/src/cmd/alias.go @@ -1,9 +1,9 @@ package cmd import ( - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/append.go b/src/cmd/append.go index 2ff613c3a9e..e0200881702 100644 --- a/src/cmd/append.go +++ b/src/cmd/append.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/prompt" - "github.com/Originate/git-town/src/script" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/prompt" + "github.com/git-town/git-town/src/script" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/config.go b/src/cmd/config.go index 981fda4c4ae..c39508ef6d7 100644 --- a/src/cmd/config.go +++ b/src/cmd/config.go @@ -3,9 +3,9 @@ package cmd import ( "fmt" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/prompt" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/prompt" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/continue.go b/src/cmd/continue.go index 017d11fe9e0..bd75de9f8d9 100644 --- a/src/cmd/continue.go +++ b/src/cmd/continue.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/discard.go b/src/cmd/discard.go index f7e88caaec4..1012d977b44 100644 --- a/src/cmd/discard.go +++ b/src/cmd/discard.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/hack.go b/src/cmd/hack.go index 82b2e362220..4e7d25e2202 100644 --- a/src/cmd/hack.go +++ b/src/cmd/hack.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/prompt" - "github.com/Originate/git-town/src/script" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/prompt" + "github.com/git-town/git-town/src/script" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/install_fish_autocompletion.go b/src/cmd/install_fish_autocompletion.go index 7cedf278abc..b7898ff748b 100644 --- a/src/cmd/install_fish_autocompletion.go +++ b/src/cmd/install_fish_autocompletion.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/kill.go b/src/cmd/kill.go index a34580a1f98..46ff1424e5f 100644 --- a/src/cmd/kill.go +++ b/src/cmd/kill.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/prompt" - "github.com/Originate/git-town/src/script" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/prompt" + "github.com/git-town/git-town/src/script" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/main_branch.go b/src/cmd/main_branch.go index e9038c8367d..031beacf597 100644 --- a/src/cmd/main_branch.go +++ b/src/cmd/main_branch.go @@ -1,8 +1,8 @@ package cmd import ( - "github.com/Originate/git-town/src/cfmt" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/cfmt" + "github.com/git-town/git-town/src/git" "github.com/spf13/cobra" ) diff --git a/src/cmd/new_branch_push_flag.go b/src/cmd/new_branch_push_flag.go index 9b3ca2b3683..a24dce0c6f0 100644 --- a/src/cmd/new_branch_push_flag.go +++ b/src/cmd/new_branch_push_flag.go @@ -3,9 +3,9 @@ package cmd import ( "strconv" - "github.com/Originate/git-town/src/cfmt" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/cfmt" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/new_pull_request.go b/src/cmd/new_pull_request.go index 259ba056e49..a3de61c73cd 100644 --- a/src/cmd/new_pull_request.go +++ b/src/cmd/new_pull_request.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/drivers" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/prompt" - "github.com/Originate/git-town/src/script" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/drivers" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/prompt" + "github.com/git-town/git-town/src/script" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/offline_mode.go b/src/cmd/offline_mode.go index b537224b159..38ce8c65861 100644 --- a/src/cmd/offline_mode.go +++ b/src/cmd/offline_mode.go @@ -1,9 +1,9 @@ package cmd import ( - "github.com/Originate/git-town/src/cfmt" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/cfmt" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/perennial_branches.go b/src/cmd/perennial_branches.go index acb64fcf514..0700695e286 100644 --- a/src/cmd/perennial_branches.go +++ b/src/cmd/perennial_branches.go @@ -1,9 +1,9 @@ package cmd import ( - "github.com/Originate/git-town/src/cfmt" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/prompt" + "github.com/git-town/git-town/src/cfmt" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/prompt" "github.com/spf13/cobra" ) diff --git a/src/cmd/prepend.go b/src/cmd/prepend.go index b263a05956c..50a2f23067d 100644 --- a/src/cmd/prepend.go +++ b/src/cmd/prepend.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/prompt" - "github.com/Originate/git-town/src/script" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/prompt" + "github.com/git-town/git-town/src/script" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/prune_branches.go b/src/cmd/prune_branches.go index e185dd74290..ae4ef16a4ac 100644 --- a/src/cmd/prune_branches.go +++ b/src/cmd/prune_branches.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/pull_branch_strategy.go b/src/cmd/pull_branch_strategy.go index fae8824dab4..24520e7242e 100644 --- a/src/cmd/pull_branch_strategy.go +++ b/src/cmd/pull_branch_strategy.go @@ -3,8 +3,8 @@ package cmd import ( "fmt" - "github.com/Originate/git-town/src/cfmt" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/cfmt" + "github.com/git-town/git-town/src/git" "github.com/spf13/cobra" ) diff --git a/src/cmd/rename_branch.go b/src/cmd/rename_branch.go index 174be04ed37..73b2106eb30 100644 --- a/src/cmd/rename_branch.go +++ b/src/cmd/rename_branch.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/repo.go b/src/cmd/repo.go index d076fa25b91..6b3846e259a 100644 --- a/src/cmd/repo.go +++ b/src/cmd/repo.go @@ -1,10 +1,10 @@ package cmd import ( - "github.com/Originate/git-town/src/drivers" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/drivers" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/root.go b/src/cmd/root.go index 70fca2f012c..efc28ba6316 100644 --- a/src/cmd/root.go +++ b/src/cmd/root.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/command" - "github.com/Originate/git-town/src/git" "github.com/fatih/color" + "github.com/git-town/git-town/src/command" + "github.com/git-town/git-town/src/git" "github.com/spf13/cobra" ) diff --git a/src/cmd/set_parent_branch.go b/src/cmd/set_parent_branch.go index 5c582a5eeb2..369ce999561 100644 --- a/src/cmd/set_parent_branch.go +++ b/src/cmd/set_parent_branch.go @@ -1,9 +1,9 @@ package cmd import ( - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/prompt" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/prompt" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/shared.go b/src/cmd/shared.go index b9da3dcceed..957bc93ead6 100644 --- a/src/cmd/shared.go +++ b/src/cmd/shared.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/prompt" - "github.com/Originate/git-town/src/script" - "github.com/Originate/git-town/src/steps" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/prompt" + "github.com/git-town/git-town/src/script" + "github.com/git-town/git-town/src/steps" ) // These variables represent command-line flags diff --git a/src/cmd/ship.go b/src/cmd/ship.go index 0edf70fa3ef..b2e53ed4bb3 100644 --- a/src/cmd/ship.go +++ b/src/cmd/ship.go @@ -5,12 +5,12 @@ import ( "os" "strings" - "github.com/Originate/git-town/src/drivers" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/prompt" - "github.com/Originate/git-town/src/script" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/drivers" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/prompt" + "github.com/git-town/git-town/src/script" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/skip.go b/src/cmd/skip.go index d7688ed18e8..38726c89d25 100644 --- a/src/cmd/skip.go +++ b/src/cmd/skip.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/sync.go b/src/cmd/sync.go index 68165e17271..7b9d437f35b 100644 --- a/src/cmd/sync.go +++ b/src/cmd/sync.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/prompt" - "github.com/Originate/git-town/src/script" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/prompt" + "github.com/git-town/git-town/src/script" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/cmd/undo.go b/src/cmd/undo.go index 7bf685139f2..09ca715b115 100644 --- a/src/cmd/undo.go +++ b/src/cmd/undo.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/steps" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/steps" + "github.com/git-town/git-town/src/util" "github.com/spf13/cobra" ) diff --git a/src/command/result.go b/src/command/result.go index 4b064339b2c..10953dfa531 100644 --- a/src/command/result.go +++ b/src/command/result.go @@ -3,8 +3,8 @@ package command import ( "strings" - "github.com/Originate/git-town/src/util" "github.com/acarl005/stripansi" + "github.com/git-town/git-town/src/util" ) // Result contains the results of a command run in a subshell. diff --git a/src/command/run.go b/src/command/run.go index 39f38e984ca..2fe07b56951 100644 --- a/src/command/run.go +++ b/src/command/run.go @@ -85,7 +85,7 @@ func RunWith(opts Options, cmd string, args ...string) (*Result, error) { // Capturing the output and scanning for the actual content needed // would introduce substantial amounts of multi-threaded complexity // for not enough gains. - // https://github.com/Originate/go-execplus could help make this more robust. + // https://github.com/git-town/go-execplus could help make this more robust. time.Sleep(InputDelay) _, err := input.Write([]byte(userInput)) if err != nil { diff --git a/src/command/run_test.go b/src/command/run_test.go index ccca51beb7c..80c210de035 100644 --- a/src/command/run_test.go +++ b/src/command/run_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/Originate/git-town/src/command" + "github.com/git-town/git-town/src/command" "github.com/stretchr/testify/assert" ) diff --git a/src/drivers/bitbucket.go b/src/drivers/bitbucket.go index 399fe813b02..0be1ec82905 100644 --- a/src/drivers/bitbucket.go +++ b/src/drivers/bitbucket.go @@ -6,7 +6,7 @@ import ( "net/url" "strings" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/git" ) type bitbucketCodeHostingDriver struct { @@ -35,7 +35,7 @@ func (d *bitbucketCodeHostingDriver) GetRepositoryURL() string { } func (d *bitbucketCodeHostingDriver) MergePullRequest(options MergePullRequestOptions) (string, error) { - return "", errors.New("shipping pull requests via the Bitbucket API is currently not supported. If you need this functionality, please vote for it by opening a ticket at https://github.com/originate/git-town/issues") + return "", errors.New("shipping pull requests via the Bitbucket API is currently not supported. If you need this functionality, please vote for it by opening a ticket at https://github.com/git-town/git-town/issues") } func (d *bitbucketCodeHostingDriver) HostingServiceName() string { diff --git a/src/drivers/core.go b/src/drivers/core.go index c565153e143..c7d4a3f2e3d 100644 --- a/src/drivers/core.go +++ b/src/drivers/core.go @@ -1,6 +1,6 @@ package drivers -import "github.com/Originate/git-town/src/git" +import "github.com/git-town/git-town/src/git" // Core provides the public API for the drivers subsystem diff --git a/src/drivers/core_test.go b/src/drivers/core_test.go index 11bcbb1a965..cd31aff4265 100644 --- a/src/drivers/core_test.go +++ b/src/drivers/core_test.go @@ -3,72 +3,72 @@ package drivers_test import ( "testing" - "github.com/Originate/git-town/src/drivers" + "github.com/git-town/git-town/src/drivers" "github.com/stretchr/testify/assert" ) func TestGetDriver_DriverType_Bitbucket(t *testing.T) { driver := drivers.GetDriver(drivers.DriverOptions{ DriverType: "bitbucket", - OriginURL: "git@self-hosted-bitbucket.com:Originate/git-town.git", + OriginURL: "git@self-hosted-bitbucket.com:git-town/git-town.git", }) assert.NotNil(t, driver) assert.Equal(t, "Bitbucket", driver.HostingServiceName()) - assert.Equal(t, "https://self-hosted-bitbucket.com/Originate/git-town", driver.GetRepositoryURL()) + assert.Equal(t, "https://self-hosted-bitbucket.com/git-town/git-town", driver.GetRepositoryURL()) } func TestGetDriver_DriverType_GitHub(t *testing.T) { driver := drivers.GetDriver(drivers.DriverOptions{ DriverType: "github", - OriginURL: "git@self-hosted-github.com:Originate/git-town.git", + OriginURL: "git@self-hosted-github.com:git-town/git-town.git", }) assert.NotNil(t, driver) assert.Equal(t, "GitHub", driver.HostingServiceName()) - assert.Equal(t, "https://self-hosted-github.com/Originate/git-town", driver.GetRepositoryURL()) + assert.Equal(t, "https://self-hosted-github.com/git-town/git-town", driver.GetRepositoryURL()) } func TestGetDriver_DriverType_GitLab(t *testing.T) { driver := drivers.GetDriver(drivers.DriverOptions{ DriverType: "gitlab", - OriginURL: "git@self-hosted-gitlab.com:Originate/git-town.git", + OriginURL: "git@self-hosted-gitlab.com:git-town/git-town.git", }) assert.NotNil(t, driver) assert.Equal(t, "GitLab", driver.HostingServiceName()) - assert.Equal(t, "https://self-hosted-gitlab.com/Originate/git-town", driver.GetRepositoryURL()) + assert.Equal(t, "https://self-hosted-gitlab.com/git-town/git-town", driver.GetRepositoryURL()) } func TestGetDriver_OriginHostname_Bitbucket(t *testing.T) { driver := drivers.GetDriver(drivers.DriverOptions{ - OriginURL: "git@my-ssh-identity.com:Originate/git-town.git", + OriginURL: "git@my-ssh-identity.com:git-town/git-town.git", OriginHostname: "bitbucket.org", }) assert.NotNil(t, driver) assert.Equal(t, "Bitbucket", driver.HostingServiceName()) - assert.Equal(t, "https://bitbucket.org/Originate/git-town", driver.GetRepositoryURL()) + assert.Equal(t, "https://bitbucket.org/git-town/git-town", driver.GetRepositoryURL()) } func TestGetDriver_OriginHostname_GitHub(t *testing.T) { driver := drivers.GetDriver(drivers.DriverOptions{ - OriginURL: "git@my-ssh-identity.com:Originate/git-town.git", + OriginURL: "git@my-ssh-identity.com:git-town/git-town.git", OriginHostname: "github.com", }) assert.NotNil(t, driver) assert.Equal(t, "GitHub", driver.HostingServiceName()) - assert.Equal(t, "https://github.com/Originate/git-town", driver.GetRepositoryURL()) + assert.Equal(t, "https://github.com/git-town/git-town", driver.GetRepositoryURL()) } func TestGetDriver_OriginHostname_GitLab(t *testing.T) { driver := drivers.GetDriver(drivers.DriverOptions{ - OriginURL: "git@my-ssh-identity.com:Originate/git-town.git", + OriginURL: "git@my-ssh-identity.com:git-town/git-town.git", OriginHostname: "gitlab.com", }) assert.NotNil(t, driver) assert.Equal(t, "GitLab", driver.HostingServiceName()) - assert.Equal(t, "https://gitlab.com/Originate/git-town", driver.GetRepositoryURL()) + assert.Equal(t, "https://gitlab.com/git-town/git-town", driver.GetRepositoryURL()) } diff --git a/src/drivers/github.go b/src/drivers/github.go index 5403248677e..1918235e6d3 100644 --- a/src/drivers/github.go +++ b/src/drivers/github.go @@ -10,7 +10,7 @@ import ( "golang.org/x/oauth2" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/git" "github.com/google/go-github/github" ) diff --git a/src/drivers/github_test.go b/src/drivers/github_test.go index 9c17852577c..39efad87e4e 100644 --- a/src/drivers/github_test.go +++ b/src/drivers/github_test.go @@ -6,13 +6,13 @@ import ( "net/http" "testing" - . "github.com/Originate/git-town/src/drivers" + . "github.com/git-town/git-town/src/drivers" "github.com/stretchr/testify/assert" httpmock "gopkg.in/jarcoal/httpmock.v1" ) -var pullRequestBaseURL = "https://api.github.com/repos/Originate/git-town/pulls" -var currentPullRequestURL = pullRequestBaseURL + "?base=main&head=Originate%3Afeature&state=open" +var pullRequestBaseURL = "https://api.github.com/repos/git-town/git-town/pulls" +var currentPullRequestURL = pullRequestBaseURL + "?base=main&head=git-town%3Afeature&state=open" var childPullRequestsURL = pullRequestBaseURL + "?base=feature&state=open" var mergePullRequestURL = pullRequestBaseURL + "/1/merge" var updatePullRequestBaseURL1 = pullRequestBaseURL + "/2" @@ -20,7 +20,7 @@ var updatePullRequestBaseURL2 = pullRequestBaseURL + "/3" func setupDriver(t *testing.T, token string) (CodeHostingDriver, func()) { httpmock.Activate() - driver := GetDriver(DriverOptions{OriginURL: "git@github.com:Originate/git-town.git"}) + driver := GetDriver(DriverOptions{OriginURL: "git@github.com:git-town/git-town.git"}) assert.NotNil(t, driver) if token != "" { driver.SetAPIToken(token) diff --git a/src/drivers/gitlab.go b/src/drivers/gitlab.go index 780e82be09a..8cf0edb6b23 100644 --- a/src/drivers/gitlab.go +++ b/src/drivers/gitlab.go @@ -5,7 +5,7 @@ import ( "fmt" "net/url" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/git" ) type gitlabCodeHostingDriver struct { @@ -34,7 +34,7 @@ func (d *gitlabCodeHostingDriver) GetRepositoryURL() string { } func (d *gitlabCodeHostingDriver) MergePullRequest(options MergePullRequestOptions) (string, error) { - return "", errors.New("shipping pull requests via the GitLab API is currently not supported. If you need this functionality, please vote for it by opening a ticket at https://github.com/originate/git-town/issues") + return "", errors.New("shipping pull requests via the GitLab API is currently not supported. If you need this functionality, please vote for it by opening a ticket at https://github.com/git-town/git-town/issues") } func (d *gitlabCodeHostingDriver) HostingServiceName() string { diff --git a/src/git/branch.go b/src/git/branch.go index 0d3d89e048a..a4db51eb8e8 100644 --- a/src/git/branch.go +++ b/src/git/branch.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/Originate/git-town/src/command" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/command" + "github.com/git-town/git-town/src/util" ) // DoesBranchHaveUnmergedCommits returns whether the branch with the given name diff --git a/src/git/config.go b/src/git/config.go index 3fa7b7c6199..b89833582ed 100644 --- a/src/git/config.go +++ b/src/git/config.go @@ -14,8 +14,8 @@ import ( "strconv" "strings" - "github.com/Originate/git-town/src/command" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/command" + "github.com/git-town/git-town/src/util" ) // Configuration manages the Git Town configuration diff --git a/src/git/current_branch.go b/src/git/current_branch.go index 5aa25f6c7df..9f6b69c25a5 100644 --- a/src/git/current_branch.go +++ b/src/git/current_branch.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "strings" - "github.com/Originate/git-town/src/command" - "github.com/Originate/git-town/src/dryrun" + "github.com/git-town/git-town/src/command" + "github.com/git-town/git-town/src/dryrun" ) // The current branch in cached in order to minimize the number of git commands run diff --git a/src/git/environment.go b/src/git/environment.go index 1bc05e43532..9e490e0709d 100644 --- a/src/git/environment.go +++ b/src/git/environment.go @@ -3,7 +3,7 @@ package git import ( "errors" - "github.com/Originate/git-town/src/command" + "github.com/git-town/git-town/src/command" ) // ValidateIsRepository asserts that the current directory is in a repository diff --git a/src/git/log.go b/src/git/log.go index 11381bc3224..823fd789187 100644 --- a/src/git/log.go +++ b/src/git/log.go @@ -1,6 +1,6 @@ package git -import "github.com/Originate/git-town/src/command" +import "github.com/git-town/git-town/src/command" // GetLastCommitMessage returns the commit message for the last commit func GetLastCommitMessage() string { diff --git a/src/git/printable.go b/src/git/printable.go index 1ebeaba4d43..51a925c5c5a 100644 --- a/src/git/printable.go +++ b/src/git/printable.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/util" ) var noneString = "[none]" diff --git a/src/git/remotes.go b/src/git/remotes.go index 9f0d4a9f02b..89b72fa7295 100644 --- a/src/git/remotes.go +++ b/src/git/remotes.go @@ -1,8 +1,8 @@ package git import ( - "github.com/Originate/git-town/src/command" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/command" + "github.com/git-town/git-town/src/util" ) // Remotes are cached in order to minimize the number of git commands run diff --git a/src/git/sha.go b/src/git/sha.go index 78d9d423c50..cef23132b6f 100644 --- a/src/git/sha.go +++ b/src/git/sha.go @@ -1,6 +1,6 @@ package git -import "github.com/Originate/git-town/src/command" +import "github.com/git-town/git-town/src/command" // GetBranchSha returns the SHA1 of the latest commit // on the branch with the given name. diff --git a/src/git/status.go b/src/git/status.go index d2cf8524b8d..641f2c8af43 100644 --- a/src/git/status.go +++ b/src/git/status.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/command" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/command" + "github.com/git-town/git-town/src/util" ) // EnsureDoesNotHaveConflicts asserts that the workspace diff --git a/src/git/user.go b/src/git/user.go index 81b5a808aa4..6584c4ea95a 100644 --- a/src/git/user.go +++ b/src/git/user.go @@ -1,6 +1,6 @@ package git -import "github.com/Originate/git-town/src/command" +import "github.com/git-town/git-town/src/command" // GetLocalAuthor returns the locally Git configured user func GetLocalAuthor() string { diff --git a/src/git/version.go b/src/git/version.go index 9ddfd322e11..76a80f24b3e 100644 --- a/src/git/version.go +++ b/src/git/version.go @@ -6,8 +6,8 @@ import ( "regexp" "strconv" - "github.com/Originate/git-town/src/command" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/command" + "github.com/git-town/git-town/src/util" ) // EnsureVersionRequirementSatisfied asserts that Git is the needed version or higher diff --git a/src/prompt/config.go b/src/prompt/config.go index 4ca4cf57f3a..0fc288dbf00 100644 --- a/src/prompt/config.go +++ b/src/prompt/config.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/Originate/git-town/src/git" "github.com/fatih/color" + "github.com/git-town/git-town/src/git" ) // EnsureIsConfigured has the user to confgure the main branch and perennial branches if needed diff --git a/src/prompt/parent_branches.go b/src/prompt/parent_branches.go index 74514502a39..8a17f8c385a 100644 --- a/src/prompt/parent_branches.go +++ b/src/prompt/parent_branches.go @@ -3,8 +3,8 @@ package prompt import ( "fmt" - "github.com/Originate/git-town/src/cfmt" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/cfmt" + "github.com/git-town/git-town/src/git" ) // EnsureKnowsParentBranches asserts that the entire ancestry for all given branches diff --git a/src/prompt/squash_commit_author.go b/src/prompt/squash_commit_author.go index 789d9ba84f7..f69cd885a4b 100644 --- a/src/prompt/squash_commit_author.go +++ b/src/prompt/squash_commit_author.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/Originate/git-town/src/cfmt" - "github.com/Originate/git-town/src/command" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/cfmt" + "github.com/git-town/git-town/src/command" + "github.com/git-town/git-town/src/git" survey "gopkg.in/AlecAivazis/survey.v1" ) diff --git a/src/script/script.go b/src/script/script.go index 4321efeaa50..de9d4f3b3b3 100644 --- a/src/script/script.go +++ b/src/script/script.go @@ -7,9 +7,9 @@ import ( "runtime" "strings" - "github.com/Originate/git-town/src/browsers" - "github.com/Originate/git-town/src/dryrun" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/browsers" + "github.com/git-town/git-town/src/dryrun" + "github.com/git-town/git-town/src/git" "github.com/fatih/color" ) diff --git a/src/steps/abort_merge_branch_step.go b/src/steps/abort_merge_branch_step.go index 1f0612a508e..d73e64f5ff1 100644 --- a/src/steps/abort_merge_branch_step.go +++ b/src/steps/abort_merge_branch_step.go @@ -1,6 +1,6 @@ package steps -import "github.com/Originate/git-town/src/script" +import "github.com/git-town/git-town/src/script" // AbortMergeBranchStep aborts the current merge conflict. type AbortMergeBranchStep struct { diff --git a/src/steps/abort_rebase_branch_step.go b/src/steps/abort_rebase_branch_step.go index 6653cc6ddd5..a264da2f14b 100644 --- a/src/steps/abort_rebase_branch_step.go +++ b/src/steps/abort_rebase_branch_step.go @@ -1,7 +1,7 @@ package steps import ( - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/script" ) // AbortRebaseBranchStep represents aborting on ongoing merge conflict. diff --git a/src/steps/add_to_perennial_branch.go b/src/steps/add_to_perennial_branch.go index 5c848bfa28d..c0037eed17a 100644 --- a/src/steps/add_to_perennial_branch.go +++ b/src/steps/add_to_perennial_branch.go @@ -1,6 +1,6 @@ package steps -import "github.com/Originate/git-town/src/git" +import "github.com/git-town/git-town/src/git" // AddToPerennialBranches adds the branch with the given name as a perennial branch type AddToPerennialBranches struct { diff --git a/src/steps/change_directory_step.go b/src/steps/change_directory_step.go index 006d56666e2..527ac1568a1 100644 --- a/src/steps/change_directory_step.go +++ b/src/steps/change_directory_step.go @@ -3,7 +3,7 @@ package steps import ( "os" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/script" ) // ChangeDirectoryStep changes the current working directory. diff --git a/src/steps/checkout_branch_step.go b/src/steps/checkout_branch_step.go index 44c2611f481..5879e4f1bfd 100644 --- a/src/steps/checkout_branch_step.go +++ b/src/steps/checkout_branch_step.go @@ -1,8 +1,8 @@ package steps import ( - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" ) // CheckoutBranchStep checks out a new branch. diff --git a/src/steps/commit_open_changes_step.go b/src/steps/commit_open_changes_step.go index b71430fdaac..c39c8d43fbb 100644 --- a/src/steps/commit_open_changes_step.go +++ b/src/steps/commit_open_changes_step.go @@ -3,8 +3,8 @@ package steps import ( "fmt" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" ) // CommitOpenChangesStep commits all open changes as a new commit. diff --git a/src/steps/continue_merge_branch_step.go b/src/steps/continue_merge_branch_step.go index c559fc928ff..099f3d05e33 100644 --- a/src/steps/continue_merge_branch_step.go +++ b/src/steps/continue_merge_branch_step.go @@ -1,8 +1,8 @@ package steps import ( - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" ) // ContinueMergeBranchStep finishes an ongoing merge conflict diff --git a/src/steps/continue_rebase_branch_step.go b/src/steps/continue_rebase_branch_step.go index e758e0975d0..35bfcba93aa 100644 --- a/src/steps/continue_rebase_branch_step.go +++ b/src/steps/continue_rebase_branch_step.go @@ -1,8 +1,8 @@ package steps import ( - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" ) // ContinueRebaseBranchStep finishes an ongoing rebase operation diff --git a/src/steps/create_branch_step.go b/src/steps/create_branch_step.go index 191b6db8f14..ec610a0a1e4 100644 --- a/src/steps/create_branch_step.go +++ b/src/steps/create_branch_step.go @@ -1,6 +1,6 @@ package steps -import "github.com/Originate/git-town/src/script" +import "github.com/git-town/git-town/src/script" // CreateBranchStep creates a new branch // but leaves the current branch unchanged. diff --git a/src/steps/create_pull_request_step.go b/src/steps/create_pull_request_step.go index 4b285157e87..df50f036c36 100644 --- a/src/steps/create_pull_request_step.go +++ b/src/steps/create_pull_request_step.go @@ -1,9 +1,9 @@ package steps import ( - "github.com/Originate/git-town/src/drivers" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/drivers" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" ) // CreatePullRequestStep creates a new pull request for the current branch. diff --git a/src/steps/create_remote_branch_step.go b/src/steps/create_remote_branch_step.go index 029209406c0..a36a00a62ed 100644 --- a/src/steps/create_remote_branch_step.go +++ b/src/steps/create_remote_branch_step.go @@ -1,7 +1,7 @@ package steps import ( - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/script" ) // CreateRemoteBranchStep pushes the current branch up to origin. diff --git a/src/steps/create_tracking_branch_step.go b/src/steps/create_tracking_branch_step.go index a44d7cc42d6..c739d37c605 100644 --- a/src/steps/create_tracking_branch_step.go +++ b/src/steps/create_tracking_branch_step.go @@ -1,7 +1,7 @@ package steps import ( - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/script" ) // CreateTrackingBranchStep pushes the current branch up to origin diff --git a/src/steps/delete_local_branch_step.go b/src/steps/delete_local_branch_step.go index 65c4fc3043a..e41ff6229fe 100644 --- a/src/steps/delete_local_branch_step.go +++ b/src/steps/delete_local_branch_step.go @@ -1,8 +1,8 @@ package steps import ( - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" ) // DeleteLocalBranchStep deletes the branch with the given name, diff --git a/src/steps/delete_parent_branch_step.go b/src/steps/delete_parent_branch_step.go index 0da190eb3e7..689092ec314 100644 --- a/src/steps/delete_parent_branch_step.go +++ b/src/steps/delete_parent_branch_step.go @@ -1,6 +1,6 @@ package steps -import "github.com/Originate/git-town/src/git" +import "github.com/git-town/git-town/src/git" // DeleteParentBranchStep removes the parent branch entry in the Git Town configuration. type DeleteParentBranchStep struct { diff --git a/src/steps/delete_remote_branch_step.go b/src/steps/delete_remote_branch_step.go index e9cbde66b4e..07614a9b754 100644 --- a/src/steps/delete_remote_branch_step.go +++ b/src/steps/delete_remote_branch_step.go @@ -1,8 +1,8 @@ package steps import ( - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" ) // DeleteRemoteBranchStep deletes the current branch from the origin remote. diff --git a/src/steps/discard_open_changes_step.go b/src/steps/discard_open_changes_step.go index 5ed0aa4fd9c..20c7159543f 100644 --- a/src/steps/discard_open_changes_step.go +++ b/src/steps/discard_open_changes_step.go @@ -1,7 +1,7 @@ package steps import ( - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/script" ) // DiscardOpenChangesStep resets the branch to the last commit, discarding uncommitted changes. diff --git a/src/steps/driver_merge_pull_request_step.go b/src/steps/driver_merge_pull_request_step.go index 22b2032683b..f6dd2f3a477 100644 --- a/src/steps/driver_merge_pull_request_step.go +++ b/src/steps/driver_merge_pull_request_step.go @@ -3,9 +3,9 @@ package steps import ( "fmt" - "github.com/Originate/git-town/src/drivers" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/drivers" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" ) // DriverMergePullRequestStep squash merges the branch with the given name into the current branch diff --git a/src/steps/ensure_has_shippable_changes_step.go b/src/steps/ensure_has_shippable_changes_step.go index 40b15ac3c03..6f942a592a9 100644 --- a/src/steps/ensure_has_shippable_changes_step.go +++ b/src/steps/ensure_has_shippable_changes_step.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/git" ) // EnsureHasShippableChangesStep asserts that the branch has unique changes not on the main branch diff --git a/src/steps/fetch_upstream_step.go b/src/steps/fetch_upstream_step.go index 25e99926bf8..09b44c2e56e 100644 --- a/src/steps/fetch_upstream_step.go +++ b/src/steps/fetch_upstream_step.go @@ -1,7 +1,7 @@ package steps import ( - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/script" ) // FetchUpstreamStep brings the Git history of the local repository diff --git a/src/steps/merge_branch_step.go b/src/steps/merge_branch_step.go index 76cb0acf25b..c6e01c8cf9e 100644 --- a/src/steps/merge_branch_step.go +++ b/src/steps/merge_branch_step.go @@ -1,8 +1,8 @@ package steps import ( - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" ) // MergeBranchStep merges the branch with the given name into the current branch diff --git a/src/steps/preserve_checkout_history_step.go b/src/steps/preserve_checkout_history_step.go index b7c179457ef..a52dbd3db12 100644 --- a/src/steps/preserve_checkout_history_step.go +++ b/src/steps/preserve_checkout_history_step.go @@ -1,8 +1,8 @@ package steps import ( - "github.com/Originate/git-town/src/command" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/command" + "github.com/git-town/git-town/src/git" ) // PreserveCheckoutHistoryStep does stuff diff --git a/src/steps/pull_branch_step.go b/src/steps/pull_branch_step.go index 205147ed73b..c6aa5849749 100644 --- a/src/steps/pull_branch_step.go +++ b/src/steps/pull_branch_step.go @@ -1,6 +1,6 @@ package steps -import "github.com/Originate/git-town/src/script" +import "github.com/git-town/git-town/src/script" // PullBranchStep pulls the branch with the given name from the origin remote type PullBranchStep struct { diff --git a/src/steps/push_branch_step.go b/src/steps/push_branch_step.go index 8489da12cf2..fda3aa8c572 100644 --- a/src/steps/push_branch_step.go +++ b/src/steps/push_branch_step.go @@ -1,9 +1,9 @@ package steps import ( - "github.com/Originate/git-town/src/dryrun" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/dryrun" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" ) // PushBranchStep pushes the branch with the given name to the origin remote. diff --git a/src/steps/push_tags_step.go b/src/steps/push_tags_step.go index d018765cb2f..2840baf7de4 100644 --- a/src/steps/push_tags_step.go +++ b/src/steps/push_tags_step.go @@ -1,7 +1,7 @@ package steps import ( - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/script" ) // PushTagsStep pushes newly created Git tags to the remote. diff --git a/src/steps/rebase_branch_step.go b/src/steps/rebase_branch_step.go index b9d098c0dbb..c148b579be6 100644 --- a/src/steps/rebase_branch_step.go +++ b/src/steps/rebase_branch_step.go @@ -1,8 +1,8 @@ package steps import ( - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" ) // RebaseBranchStep rebases the current branch diff --git a/src/steps/remove_from_perennial_branch.go b/src/steps/remove_from_perennial_branch.go index 8316c3fa3ee..df7fa7299cf 100644 --- a/src/steps/remove_from_perennial_branch.go +++ b/src/steps/remove_from_perennial_branch.go @@ -1,6 +1,6 @@ package steps -import "github.com/Originate/git-town/src/git" +import "github.com/git-town/git-town/src/git" // RemoveFromPerennialBranches removes the branch with the given name as a perennial branch type RemoveFromPerennialBranches struct { diff --git a/src/steps/reset_to_sha_step.go b/src/steps/reset_to_sha_step.go index a4ba3e5d57f..24a7f7c4a48 100644 --- a/src/steps/reset_to_sha_step.go +++ b/src/steps/reset_to_sha_step.go @@ -1,8 +1,8 @@ package steps import ( - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/script" ) // ResetToShaStep undoes all commits on the current branch diff --git a/src/steps/restore_open_changes_step.go b/src/steps/restore_open_changes_step.go index 12ed8992887..0fa3c7e46ba 100644 --- a/src/steps/restore_open_changes_step.go +++ b/src/steps/restore_open_changes_step.go @@ -1,7 +1,7 @@ package steps import ( - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/script" ) // RestoreOpenChangesStep restores stashed away changes into the workspace. diff --git a/src/steps/revert_commit_step.go b/src/steps/revert_commit_step.go index 0b4aafa481c..8b2cb5a1415 100644 --- a/src/steps/revert_commit_step.go +++ b/src/steps/revert_commit_step.go @@ -1,6 +1,6 @@ package steps -import "github.com/Originate/git-town/src/script" +import "github.com/git-town/git-town/src/script" // RevertCommitStep reverts the commit with the given sha. type RevertCommitStep struct { diff --git a/src/steps/run.go b/src/steps/run.go index 062d15a540e..f7e5577d0b7 100644 --- a/src/steps/run.go +++ b/src/steps/run.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/util" "github.com/fatih/color" ) diff --git a/src/steps/run_state.go b/src/steps/run_state.go index 740ecaf6476..770b152764a 100644 --- a/src/steps/run_state.go +++ b/src/steps/run_state.go @@ -3,7 +3,7 @@ package steps import ( "time" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/git" ) // UnfinishedRunStateDetails has details about an unfinished run state diff --git a/src/steps/run_state_test.go b/src/steps/run_state_test.go index 27016cee7ce..5895ac34d76 100644 --- a/src/steps/run_state_test.go +++ b/src/steps/run_state_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/Originate/git-town/src/steps" + "github.com/git-town/git-town/src/steps" "github.com/stretchr/testify/assert" ) diff --git a/src/steps/run_state_to_disk.go b/src/steps/run_state_to_disk.go index 945d875c874..d2d3ff141df 100644 --- a/src/steps/run_state_to_disk.go +++ b/src/steps/run_state_to_disk.go @@ -8,8 +8,8 @@ import ( "path/filepath" "regexp" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/util" ) // LoadPreviousRunState loads the run state from disk if it exists or creates a new run state diff --git a/src/steps/set_parent_branch_step.go b/src/steps/set_parent_branch_step.go index 93ba442a35d..f5d76851ea9 100644 --- a/src/steps/set_parent_branch_step.go +++ b/src/steps/set_parent_branch_step.go @@ -1,6 +1,6 @@ package steps -import "github.com/Originate/git-town/src/git" +import "github.com/git-town/git-town/src/git" // SetParentBranchStep registers the branch with the given name as a parent // of the branch with the other given name. diff --git a/src/steps/squash_merge_branch_step.go b/src/steps/squash_merge_branch_step.go index 194ca4dccc2..84cca90fe52 100644 --- a/src/steps/squash_merge_branch_step.go +++ b/src/steps/squash_merge_branch_step.go @@ -3,9 +3,9 @@ package steps import ( "fmt" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/prompt" - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/prompt" + "github.com/git-town/git-town/src/script" ) // SquashMergeBranchStep squash merges the branch with the given name into the current branch diff --git a/src/steps/stash_open_changes_step.go b/src/steps/stash_open_changes_step.go index b37e529e37e..d12eab1dbe8 100644 --- a/src/steps/stash_open_changes_step.go +++ b/src/steps/stash_open_changes_step.go @@ -1,7 +1,7 @@ package steps import ( - "github.com/Originate/git-town/src/script" + "github.com/git-town/git-town/src/script" ) // StashOpenChangesStep stores all uncommitted changes on the Git stash. diff --git a/src/steps/step_list.go b/src/steps/step_list.go index 3c3e88f4ccb..316dcaf8e01 100644 --- a/src/steps/step_list.go +++ b/src/steps/step_list.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/git" ) // StepList is a list of steps diff --git a/src/steps/sync_steps.go b/src/steps/sync_steps.go index 82c39f462c0..bb9ac469f00 100644 --- a/src/steps/sync_steps.go +++ b/src/steps/sync_steps.go @@ -3,7 +3,7 @@ package steps import ( "fmt" - "github.com/Originate/git-town/src/git" + "github.com/git-town/git-town/src/git" ) // GetSyncBranchSteps returns the steps to sync the branch with the given name. diff --git a/src/util/util.go b/src/util/util.go index e395f808a29..880996716d2 100644 --- a/src/util/util.go +++ b/src/util/util.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/Originate/git-town/src/cfmt" "github.com/fatih/color" + "github.com/git-town/git-town/src/cfmt" ) // DoesStringArrayContain returns whether the given string slice diff --git a/test/commit.go b/test/commit.go index de6472bc090..221b767fc7e 100644 --- a/test/commit.go +++ b/test/commit.go @@ -3,8 +3,8 @@ package test import ( "fmt" - "github.com/Originate/git-town/test/helpers" "github.com/cucumber/godog/gherkin" + "github.com/git-town/git-town/test/helpers" ) // Commit describes a Git commit. diff --git a/test/commit_table_builder.go b/test/commit_table_builder.go index 2ff8220c5eb..08341486ff1 100644 --- a/test/commit_table_builder.go +++ b/test/commit_table_builder.go @@ -4,7 +4,7 @@ import ( "sort" "strings" - "github.com/Originate/git-town/test/helpers" + "github.com/git-town/git-town/test/helpers" ) // CommitTableBuilder collects data about commits in Git repositories diff --git a/test/data_table.go b/test/data_table.go index 53a30a4ae66..74476aa58a0 100644 --- a/test/data_table.go +++ b/test/data_table.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "github.com/Originate/git-town/test/helpers" "github.com/cucumber/godog/gherkin" + "github.com/git-town/git-town/test/helpers" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/test/git_manager.go b/test/git_manager.go index e432579f201..6388913938a 100644 --- a/test/git_manager.go +++ b/test/git_manager.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "github.com/Originate/git-town/test/helpers" + "github.com/git-town/git-town/test/helpers" "github.com/iancoleman/strcase" ) diff --git a/test/git_repository.go b/test/git_repository.go index 9189404f82b..ef1324b75e8 100644 --- a/test/git_repository.go +++ b/test/git_repository.go @@ -8,8 +8,8 @@ import ( "sort" "strings" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/src/util" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/src/util" ) // GitRepository is a Git repository that exists inside a Git environment. diff --git a/test/shell_runner.go b/test/shell_runner.go index c3247555c9b..66b7f8dc333 100644 --- a/test/shell_runner.go +++ b/test/shell_runner.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/Originate/git-town/src/command" + "github.com/git-town/git-town/src/command" "github.com/kballard/go-shellquote" ) diff --git a/test/steps/branch_steps.go b/test/steps/branch_steps.go index ff87526ea93..64a968ae042 100644 --- a/test/steps/branch_steps.go +++ b/test/steps/branch_steps.go @@ -3,10 +3,10 @@ package steps import ( "fmt" - "github.com/Originate/git-town/src/git" - "github.com/Originate/git-town/test" "github.com/cucumber/godog" "github.com/cucumber/godog/gherkin" + "github.com/git-town/git-town/src/git" + "github.com/git-town/git-town/test" ) // BranchSteps defines Cucumber step implementations around Git branches. diff --git a/test/steps/commit_steps.go b/test/steps/commit_steps.go index 05371737774..8dda5a25191 100644 --- a/test/steps/commit_steps.go +++ b/test/steps/commit_steps.go @@ -3,9 +3,9 @@ package steps import ( "fmt" - "github.com/Originate/git-town/test/helpers" "github.com/cucumber/godog" "github.com/cucumber/godog/gherkin" + "github.com/git-town/git-town/test/helpers" ) // CommitSteps defines Cucumber step implementations around configuration. diff --git a/test/steps/run_steps.go b/test/steps/run_steps.go index f3835c98f9b..966e98a6c4c 100644 --- a/test/steps/run_steps.go +++ b/test/steps/run_steps.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/Originate/git-town/src/command" - "github.com/Originate/git-town/test" "github.com/cucumber/godog" "github.com/cucumber/godog/gherkin" + "github.com/git-town/git-town/src/command" + "github.com/git-town/git-town/test" ) // RunSteps defines Gherkin step implementations around running things in subshells. diff --git a/test/steps/scenario_state.go b/test/steps/scenario_state.go index 984435c9196..7d4fa097a11 100644 --- a/test/steps/scenario_state.go +++ b/test/steps/scenario_state.go @@ -1,9 +1,9 @@ package steps import ( - "github.com/Originate/git-town/src/command" - "github.com/Originate/git-town/test" "github.com/cucumber/godog/gherkin" + "github.com/git-town/git-town/src/command" + "github.com/git-town/git-town/test" ) // scenarioState constains the state that is shared by all steps within a scenario. diff --git a/test/steps/suite_steps.go b/test/steps/suite_steps.go index ced5ed9ed56..754e2d191ba 100644 --- a/test/steps/suite_steps.go +++ b/test/steps/suite_steps.go @@ -6,9 +6,9 @@ import ( "log" "sync" - "github.com/Originate/git-town/test" "github.com/cucumber/godog" "github.com/cucumber/godog/gherkin" + "github.com/git-town/git-town/test" ) // beforeSuiteMux ensures that we run BeforeSuite only once globally. diff --git a/website/_layout.jade b/website/_layout.jade index 3c6e797d8bf..fb1ab454c18 100644 --- a/website/_layout.jade +++ b/website/_layout.jade @@ -5,7 +5,7 @@ html link(rel="stylesheet", href="css/application.css") link(href='http://fonts.googleapis.com/css?family=Oleo+Script|Open+Sans:400,300,700', rel='stylesheet', type='text/css') link(rel="stylesheet", href="http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css") - link(rel="alternate", type="application/rss+xml", title="RSS", href="https://github.com/Originate/git-town/releases.atom") + link(rel="alternate", type="application/rss+xml", title="RSS", href="https://github.com/git-town/git-town/releases.atom") body(class="#{ current.source }") != partial("_partials/header") diff --git a/website/_partials/header.jade b/website/_partials/header.jade index 15296260715..09f7c53102b 100644 --- a/website/_partials/header.jade +++ b/website/_partials/header.jade @@ -2,7 +2,7 @@ header a.logo(href="/") img(src='img/git-town-horizontal.svg', alt="Gittown") - a.github.ion-social-github(href="https://github.com/Originate/git-town") View On GitHub + a.github.ion-social-github(href="https://github.com/git-town/git-town") View On GitHub nav #hamburger.ion-navicon-round ul#menu @@ -13,7 +13,7 @@ header li a(href='tutorial.html') Tutorial li.github - a.github.ion-social-github(href="https://github.com/Originate/git-town") View On GitHub + a.github.ion-social-github(href="https://github.com/git-town/git-town") View On GitHub script. var toggle = document.getElementById('hamburger'); diff --git a/website/index.jade b/website/index.jade index b5c32d4b016..4537d3dcd2e 100644 --- a/website/index.jade +++ b/website/index.jade @@ -5,7 +5,7 @@ html link(rel="stylesheet", href="css/application.css") link(href='http://fonts.googleapis.com/css?family=Oleo+Script|Open+Sans:400,300,700', rel='stylesheet', type='text/css') link(rel="stylesheet", href="http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css") - link(rel="alternate", type="application/rss+xml", title="RSS", href="https://github.com/Originate/git-town/releases.atom") + link(rel="alternate", type="application/rss+xml", title="RSS", href="https://github.com/git-town/git-town/releases.atom") body.index != partial("_partials/header") @@ -25,7 +25,7 @@ html .buttons a.button.learn-more(href="/install.html") Install - a.button.commands(href="https://github.com/Originate/git-town#commands") See the Commands + a.button.commands(href="https://github.com/git-town/git-town#commands") See the Commands iframe.intro-video(width="550" height="300" src="https://www.youtube.com/embed/oLaUsUlFfTo" frameborder="0" allowfullscreen) @@ -40,7 +40,7 @@ html It is intentionally generic and basic, though. Using it properly as a developer is cumbersome and repetitive. For example, correctly merging a finished feature branch requires - up to + up to 15 individual Git commands! p. @@ -63,23 +63,23 @@ html typical operations in the software development workflow. .commands.container - a(href="https://github.com/Originate/git-town/blob/master/documentation/commands/hack.md" target="_blank") + a(href="https://github.com/git-town/git-town/blob/master/documentation/commands/hack.md" target="_blank") .command h3 $ git town hack p Cuts a new up-to-date feature branch off the main branch. - a(href="https://github.com/Originate/git-town/blob/master/documentation/commands/sync.md" target="_blank") + a(href="https://github.com/git-town/git-town/blob/master/documentation/commands/sync.md" target="_blank") .command h3 $ git town sync p Updates your current branch with all ongoing changes. - a(href="https://github.com/Originate/git-town/blob/master/documentation/commands/new-pull-request.md" target="_blank") + a(href="https://github.com/git-town/git-town/blob/master/documentation/commands/new-pull-request.md" target="_blank") .command h3 $ git town new-pull-request p Create a new pull request on GitHub or Bitbucket for your current branch. - a(href="https://github.com/Originate/git-town/blob/master/documentation/commands/ship.md" target="_blank") + a(href="https://github.com/git-town/git-town/blob/master/documentation/commands/ship.md" target="_blank") .command h3 $ git town ship p Delivers your completed feature branch and removes it. - a.button.view-more(href="https://github.com/Originate/git-town#commands") View all commands + a.button.view-more(href="https://github.com/git-town/git-town#commands") View all commands section.faq h2 FAQ @@ -115,7 +115,7 @@ html p | Yes, we try to be good citizens. | If you run into any issues with your setup, please - | let us know! + | let us know! .buttons a.button.learn-more(href="/install.html") Install diff --git a/website/install.md b/website/install.md index 9136563a582..3b54a472133 100644 --- a/website/install.md +++ b/website/install.md @@ -31,7 +31,7 @@ ensure your Git version is 2.7.0 or higher._ - Install / Update: - Download the deb file from the latest release - [here](https://github.com/Originate/git-town/releases). + [here](https://github.com/git-town/git-town/releases). - Run `dpkg -i /path/to/debfile` - Uninstall: run `apt-get remove gittown` @@ -41,7 +41,7 @@ ensure your Git version is 2.7.0 or higher._ - Install / Update: - Download the 32-bit or 64-bit executable for Windows from the latest release - [here](https://github.com/Originate/git-town/releases). + [here](https://github.com/git-town/git-town/releases). - rename the file to `git-town.exe` - Put the file into the path and then Git will run it. @@ -50,7 +50,7 @@ ensure your Git version is 2.7.0 or higher._ # Manual - Install: download the Git Town binary for your platform from the - [releases page](https://github.com/Originate/git-town/releases), rename it to + [releases page](https://github.com/git-town/git-town/releases), rename it to `git-town`, make it executable with `chmod +x git-town` and put it somewhere in your `$PATH` - Update: install the new version over the old version @@ -68,8 +68,7 @@ ensure your Git version is 2.7.0 or higher._ #### Notifications about new releases -- Subscribe to our - release feed - to never miss a new release! - If you prefer email notifications, please try +- Subscribe to our + release feed to never miss a + new release! If you prefer email notifications, please try [sibbell.com](https://sibbell.com).