Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Added `project` branch type. #275

Open
wants to merge 119 commits into
from

Conversation

Projects
None yet

Added an extra branch type called project for branches that typically lives longer than a day.

nvie and others added some commits Feb 14, 2011

@nvie nvie Merge branch 'release/0.4.1' into develop baf66be
@dolmen dolmen Add an installer for the msysgit environment
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).
023ed69
@dolmen dolmen Update README for msysgit to use the new installer b52f79e
@jezdez jezdez Fixed require_tag_absent to not break when the list of tags contains …
…an ambiguous entry, e.g. looking for "1.0.1" in "0.1.0 0.1.1 0.1.2 1.0".
8f280e0
Konstantin Tjuterev - Removed quoting in has $SOME_BRANCH $(get_remote_branches), as the …
…check was always false

- Added fetching develop branch from origin when fetch flag is on in feature finish
f6fcc4e
Stefan Näwe release: start subcommand takes an optional base as well
Signed-off-by: Stefan Naewe <stefan.naewe@googlemail.com>
2074360
@nvie nvie Merge branch 'develop' of https://github.com/kostiklv/gitflow into de…
…velop
f1b3213
@nvie nvie Add Konstantin Tjuterev to the list of contributors. 2f05c3c
@nvie nvie Merge branch 'develop' of https://github.com/jezdez/gitflow into develop 499b468
@nvie nvie Add Jannis Leidel to the list of contributors. e024fa4
@nvie nvie Fix always-empty value for $DOT_GIT_DIR variable.
This fixes #53.
a7a89cd
@jbernard jbernard Set GITFLOW_DIR correctly if git-flow is a symbolic link
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.
fff16ed
@kiall kiall Add debian/ubuntu packaging. ca475ab
@kiall kiall Fixing some minor mistakes in debian/control metadata - followup to c… 6fc1323
@nvie nvie Merged pull request #120 from kiall/develop.
Add debian/ubuntu packaging
96e3e3f
@nvie nvie Moved the debian stuff to the contrib directory. 7e583b5
@nvie nvie Add Kiall Mac Innes to the list of contributors.
Thanks Kiall for the Debian package files!
d762995
@nvie nvie Merged pull request #119 from jbernard/develop.
Set GITFLOW_DIR correctly if git-flow is a symbolic link
a64939d
@nvie nvie Add Jon Bernard to the list of contributors. f9ace1f
@nvie nvie Revert "Set GITFLOW_DIR correctly if git-flow is a symbolic link"
This reverts commit fff16ed.
3626bfb

error in win7 using msysgit

WOW SOO MUCH CODEZZ!!!!!11

YES! I've been wanting this for a while. Excellent work :)

Contributor

talios replied May 17, 2011

+1 w00t :)

LOL @ "The actual impact on the amount of changed lines of source code is huge". Thanks so much!

nvie and others added some commits May 23, 2011

@nvie nvie Update the version number to distinguish HEAD from the released 0.4.1…
… version.
14bcc58
Tacit Sawk This script depends on Bash-only features, and so should not be execu…
…ted with sh.
26293bb
@nvie nvie Merge pull request #132 from kwasticat/develop
Install script depends on Bash-only features, needs slight adjustment!
0191c68
@kixx kixx Fix parsing for Bourne shell (FreeBSD) 06e854a
@MarkBorcherding MarkBorcherding Adding windows install step for libintl3.dll
I found I also needed to install this file. It was mentioned in
issue #109. Adding this step to the instruction might help others
avoid this same problem.
e73a1d9
@nvie nvie Merge pull request #138 from MarkBorcherding/feature/windows-install-…
…step

Adding windows install intruction for libintl3.dll
3d12772
@nvie nvie Merge branch 'develop' of https://github.com/kixx/gitflow into develop 7c7dc35
James Moran fixed malformed if statement 0c32062
@nvie nvie Merge pull request #141 from moranjk/develop
fixed malformed if statement

Thanks, James.
be5dabf
@algernon algernon Replace contrib/debian/ with a note on how to install on Debian.
Since gitflow is packaged for Debian and is available for testing and
sid already, remove the contrib/ directory in favour of using the
official Debian package.

Also mention how to install gitflow on Debian in the README.mdown.

Furthermore, Debian-specific things were removed from Changes.mdown
and the Makefile.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
1b454cc
@Zoramite Zoramite Adding the `eval` to force variable expansion.
Closes #50
05c4dbc
@Zoramite Zoramite Adding the variable expansion to the hotfix. d0df88d
@chad3814 chad3814 added a -D flag to the git flow finish command to try extra hard to d…
…elete the local branch after finishing the feature
9c5c806
@phoet phoet add publishing to hotfix 0b324de
@nvie nvie Fix wording. 4895c15
@nvie nvie Merge branch 'chad3814-develop' into develop
Thanks, chad3814.
447808f
@nvie nvie Merge pull request #163 from phoet/publish_hotfix
add publishing to hotfix

Thanks, pulled.
7cbdb84
@nvie nvie Add a cool new video tutorial on git-flow by Build a Module. 766159d
@emreberge emreberge develop_branch uses origin/develop_branch as start-point if one exists.
By default a local develop branch is created of from master regardless if a origin/develop exits. This problem is discussed in issues #137 and #23.
62c339e
@nvie nvie Add Changelog note and added Emre to list of contributors. 0d00b69
@ejholmes ejholmes Check if a remote master branch exists before die, track it if no loc…
…al master branch exists
baf163e
@ejholmes ejholmes Add information for contributing. 938ea5f
@ejholmes ejholmes Add --recursive. ba0cc8a
@nvie nvie Add Eric Holmes to list of contributors. 921ddf5
@nvie nvie Rewrote Eric's text a bit. 49305ec
@nvie nvie Merge branch 'develop' of github.com:nvie/gitflow into develop b4626cb
@nvie nvie Add a proposal for our Windows users.
Will this help you guys out?
4b9545e
@nvie nvie Oops, forgot about spaces in the dirname.
Quite likely for Windows users to hit this problem.
5e8cc9f
@nvie nvie Better support for the Windows platform, where backslashes are dominant. 083a588

mhart commented on 5e8cc9f Dec 1, 2011

I'm not so sure about the "not bothering our Unix users" bit - there's the extra overhead of calling out to sed, and anyone with a backslash in their directories will have it replaced (this will be very rare I realise).

What's the issue with checking for the OS?

Owner

nvie replied Dec 1, 2011

The main issue is that there doesn't seem to be a reliable way of doing so. uname is the standard way of doing this, but it is missing on the Windows platform. (Although the lack of uname could well imply we're on Windows, LOL.)

The extra sed call being "overhead" is not a very useful discussion. Tens of sed are done under the cover already with day-to-day use of git-flow. Degraded performance ain't an interesting con-argument, especially not in the context of this discussion.

mhart replied Dec 1, 2011

Fair enough then.

nvie and others added some commits Dec 1, 2011

@nvie nvie Merge branch 'feature/convert-slashes' into develop 72594ea
@sjaeckel sjaeckel fixed the installer in msysgit environment to work with windows XP
as the command 'choice' is not available on Windows XP we have to work around
this issue by usage of 'set /p'
e856e0a

vedang and others added some commits Jan 30, 2012

@vedang vedang install from my github repo 3b86dd3
@Zoramite Zoramite Updating the escape characters to fix an issue with having a + in the…
… branch name.

Since git allows for it the escape should not escape it since it then won't match the branch names correctly.
afbf92c
@Zoramite Zoramite Merge branch 'develop' into feature/Issue50 f66eba8
@nvie nvie Merge pull request #195 from Zoramite/feature/Issue148
Updating the escape characters to fix + in the branch name
ee27210
@nvie nvie Merge pull request #178 from lorin/feature/docs
Documented init -d flag and feature publish/pull
bb1becd
@nvie nvie Merge pull request #160 from Zoramite/feature/Issue50
Adding the `eval` to force variable expansion.
adfd408
@vedang @nvie vedang + nvie Added a -r flag to git-flow-feature-pull to support pull with rebase
Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
56bff9a
@nvie nvie Fix indenting. 7384052
@nvie nvie Add Vedang to AUTHORS. 53cfc35
@nvie nvie Remove the "still maintained" banner.
This is done in anticipation of their discontinuing service.
679f05f
@bloveridge @nvie bloveridge + nvie set EXPR_COMPAT=1 if running inside freebsd so shFlags works correctly
Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
f608281
@nvie nvie Update the Changelog. cc5e9a5
@nvie nvie Merge branch 'debian-installer' into develop
Conflicts:
	README.mdown
ab7fda2
@vedang vedang Added a track command to git-flow-hotfix along the lines of the git-f…
…low-feature track command
37f7d14
@sjaeckel sjaeckel make the installer for msysgit search in ~/bin as well 51011ac
Jason Schmidt Fixes #206 afb191f
@mykehsd mykehsd Release finish squash parameter
Adding an optional (false by default) -S option to 'git flow release finish' to allow squashing
the commit
6fa8fed
@mykehsd mykehsd Feature finish squash parameter
Adding an optional (false by default) -S option to 'git flow feature finish' to allow squashing
the commit
75fbdd7
@pcragone pcragone Added 'init()' function to git-flow-{feature,release,hotfix,support},…
… which gets called if subargument is not help
dc902ed
@vedang vedang Updated from upstream 6606678
@vedang vedang Merge branch 'develop' into feature/hotfix-tracking ad511b6
Kostas fixed small bug in line 510, 'it' instead of 'git' a223c3a
memleak fixes pull existing feature from remote. 12c2a9c
@sinbad sinbad Fix init -d behaviour when master branch exists, and one or more othe…
…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
2632778
@sinbad sinbad Support reading the tag message from a file in release/hotfix finish
This option ('-f' because '-F' was already taken) maps to the 'tag -F' option, and avoids the
problem with issue #98 (#98) on Mac
2e9ab49
@jasom jasom Fix broken link to original blog-post 9c48e05
@nvie nvie Merge pull request #222 from sinbad/feature/fix_default_behaviour
Fix init -d behaviour when master branch exists, and 1+ other branches exist, but develop does not
c26286e
@nvie nvie Merge pull request #223 from sinbad/feature/tagmessagefromfile
Support reading the tag message from a file in release/hotfix finish
662bcd6
@nvie nvie Merge pull request #227 from jasom/develop
Fix broken link to original blog-post
392ed79
@nvie nvie Merge pull request #220 from memleak/patch-1
fixes pull existing feature from remote.
b1cc495
@nvie nvie Merge pull request #219 from kperi/develop
small bug fix in gif-flow-feature
c072ff6
@nvie nvie Merge pull request #211 from pcragone/develop
Added 'init()' function to git-flow-{feature,release,hotfix,support}
f414f0c
@nvie nvie Cleanup (mostly whitespace issues). 0c4d0bf
@nvie nvie Merge branch 'develop' into squash-option fda5507
@nvie nvie Credit where credit is due. 805d245
@nvie nvie Revert unnecessary changes. c7e50ee
@nvie nvie Revert changes installer location. 76ec133
@nvie nvie Merge branch 'develop' into track-for-hotfix a2f53f9
@nvie nvie Merge pull request #201 from sjaeckel/feature/msysInstall
make the installer for msysgit search in ~/bin as well
aec4818
@nvie nvie Be git-describe friendly.
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,
aa93d23

This line causes an error message when doing, for example, "git flow init -fd": "line 113: init: command not found"

Line 112 should read:
if [ $SUBACTION != "help" ] && [ $SUBCOMMAND != "init" ] ; then

As the init command does not have the init function, nor does it need one.

Thanks!

plang commented on a7a89cd Jul 30, 2014

Hi, this patch solves the problem I have under OSX, and which I reported here: https://trac.macports.org/ticket/44401

Shouldn't it be merged into the master branch maybe?

Using homebrew, this bug is still there...

How is this flag used? Should the README be updated? @jeromebaum

Contributor

jeromebaum replied Dec 20, 2014

See my comment in #389 (about to post there).

  • 如果 存在 “ %USERPROFILE% \ bin \ %1 ” goto:EO

curiosity. where is git_do command?

found in gitflow-common file

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment