pull new #6431

yanjf2015 · 2018-10-23T02:38:43Z

No description provided.

This installer: - detects the Git installation path - checks prereqs (git, getopt.exe) - delete old gitflow install - install gitflow files "Access denied" errors are detected and the user is given advice in that case ( use full administrator rights).

…an ambiguous entry, e.g. looking for "1.0.1" in "0.1.0 0.1.1 0.1.2 1.0".

…check was always false - Added fetching develop branch from origin when fetch flag is on in feature finish

Signed-off-by: Stefan Naewe <[email protected]>

…velop

This fixes #53.

This allows a user to create a symbolic link to git-flow in their personal bin directory (e.g. ~/bin) without having to add the source tree to their $PATH or do a system install.

…a475ab

Add debian/ubuntu packaging

Thanks Kiall for the Debian package files!

Set GITFLOW_DIR correctly if git-flow is a symbolic link

This reverts commit fff16ed.

Installer for the Windows msysgit environment

Thanks for the MSysGit installer!

current branch, if any. This fixes #127.

… version.

…ted with sh.

Install script depends on Bash-only features, needs slight adjustment!

Adding an optional (false by default) -S option to 'git flow feature finish' to allow squashing the commit

… which gets called if subargument is not help

…r branch exists, but develop does not Without this change, init picks 'master' as both the production and integration branch and fails. With it, init detects the clash and behaves the same as if only master exists, picking 'develop' as integration branch

This option ('-f' because '-F' was already taken) maps to the 'tag -F' option, and avoids the problem with issue #98 (#98) on Mac

Fix init -d behaviour when master branch exists, and 1+ other branches exist, but develop does not

Support reading the tag message from a file in release/hotfix finish

Fix broken link to original blog-post

fixes pull existing feature from remote.

small bug fix in gif-flow-feature

Added 'init()' function to git-flow-{feature,release,hotfix,support}

make the installer for msysgit search in ~/bin as well

This patch tags commits on the original (release/hotfix branch) instead of tagging the merge commit on the master branch. This keeps the history git-describe friendly. (For related discussions, see #49, #85,

As explained by Peter van der Does, the init command does not have the init function, nor does it need one.

Prevent error message on git flow init.

nvie and others added 30 commits February 14, 2011 07:47

Merge branch 'release/0.4.1' into develop

baf66be

Update README for msysgit to use the new installer

b52f79e

Fixed require_tag_absent to not break when the list of tags contains …

8f280e0

…an ambiguous entry, e.g. looking for "1.0.1" in "0.1.0 0.1.1 0.1.2 1.0".

- Removed quoting in has $SOME_BRANCH $(get_remote_branches), as the …

f6fcc4e

…check was always false - Added fetching develop branch from origin when fetch flag is on in feature finish

release: start subcommand takes an optional base as well

2074360

Signed-off-by: Stefan Naewe <[email protected]>

Merge branch 'develop' of https://github.com/kostiklv/gitflow into de…

f1b3213

…velop

Add Konstantin Tjuterev to the list of contributors.

2f05c3c

Merge branch 'develop' of https://github.com/jezdez/gitflow into develop

499b468

Add Jannis Leidel to the list of contributors.

e024fa4

Fix always-empty value for $DOT_GIT_DIR variable.

a7a89cd

This fixes #53.

Set GITFLOW_DIR correctly if git-flow is a symbolic link

fff16ed

This allows a user to create a symbolic link to git-flow in their personal bin directory (e.g. ~/bin) without having to add the source tree to their $PATH or do a system install.

Add debian/ubuntu packaging.

ca475ab

Fixing some minor mistakes in debian/control metadata - followup to c…

6fc1323

…a475ab

Merged pull request #120 from kiall/develop.

96e3e3f

Add debian/ubuntu packaging

Moved the debian stuff to the contrib directory.

7e583b5

Add Kiall Mac Innes to the list of contributors.

d762995

Thanks Kiall for the Debian package files!

Merged pull request #119 from jbernard/develop.

a64939d

Set GITFLOW_DIR correctly if git-flow is a symbolic link

Add Jon Bernard to the list of contributors.

f9ace1f

Revert "Set GITFLOW_DIR correctly if git-flow is a symbolic link"

3626bfb

This reverts commit fff16ed.

Merge pull request #109 from dolmen/feature/msysgit-install

9720b66

Installer for the Windows msysgit environment

Add Olivier Mengué to the list of contributors.

b7fc886

Thanks for the MSysGit installer!

Make room for new minor release (and update the changelog).

c4b4b3c

Implement git flow feature finish without a branch name to finish the

cf5b2a5

current branch, if any. This fixes #127.

Update usage docs and changelog.

59e6aef

Update the changelog.

8b73fed

Update the version number to distinguish HEAD from the released 0.4.1…

14bcc58

… version.

This script depends on Bash-only features, and so should not be execu…

26293bb

…ted with sh.

Merge pull request #132 from kwasticat/develop

0191c68

Install script depends on Bash-only features, needs slight adjustment!

Fix parsing for Bourne shell (FreeBSD)

06e854a

mykehsd and others added 27 commits April 19, 2012 11:14

Feature finish squash parameter

75fbdd7

Adding an optional (false by default) -S option to 'git flow feature finish' to allow squashing the commit

Added 'init()' function to git-flow-{feature,release,hotfix,support},…

dc902ed

… which gets called if subargument is not help

Updated from upstream

6606678

Merge branch 'develop' into feature/hotfix-tracking

ad511b6

fixed small bug in line 510, 'it' instead of 'git'

a223c3a

fixes pull existing feature from remote.

12c2a9c

Support reading the tag message from a file in release/hotfix finish

2e9ab49

This option ('-f' because '-F' was already taken) maps to the 'tag -F' option, and avoids the problem with issue #98 (#98) on Mac

Fix broken link to original blog-post

9c48e05

Merge pull request #222 from sinbad/feature/fix_default_behaviour

c26286e

Fix init -d behaviour when master branch exists, and 1+ other branches exist, but develop does not

Merge pull request #223 from sinbad/feature/tagmessagefromfile

662bcd6

Support reading the tag message from a file in release/hotfix finish

Merge pull request #227 from jasom/develop

392ed79

Fix broken link to original blog-post

Merge pull request #220 from memleak/patch-1

b1cc495

fixes pull existing feature from remote.

Merge pull request #219 from kperi/develop

c072ff6

small bug fix in gif-flow-feature

Merge pull request #211 from pcragone/develop

f414f0c

Added 'init()' function to git-flow-{feature,release,hotfix,support}

Cleanup (mostly whitespace issues).

0c4d0bf

Merge branch 'develop' into squash-option

fda5507

Credit where credit is due.

805d245

Revert unnecessary changes.

c7e50ee

Revert changes installer location.

76ec133

Merge branch 'develop' into track-for-hotfix

a2f53f9

Merge pull request #201 from sjaeckel/feature/msysInstall

aec4818

make the installer for msysgit search in ~/bin as well

Be git-describe friendly.

aa93d23

This patch tags commits on the original (release/hotfix branch) instead of tagging the merge commit on the master branch. This keeps the history git-describe friendly. (For related discussions, see #49, #85,

Prevent error message on git flow init

b72a395

As explained by Peter van der Does, the init command does not have the init function, nor does it need one.

Merge pull request #235 from oddnoc/feature/112-init-fix

53e9c76

Prevent error message on git flow init.

Create a git_do command to log git actions

5bca8d9

Use git_do where appropriate

15aab26

yanjf2015 closed this Oct 23, 2018

yanjf2015 reopened this Oct 23, 2018

yanjf2015 closed this Oct 23, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

pull new #6431

pull new #6431

Uh oh!

yanjf2015 commented Oct 23, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

39 participants

pull new #6431

pull new #6431

Uh oh!

Conversation

yanjf2015 commented Oct 23, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

39 participants