Skip to content

Commit 298514b

Browse files
nvienvie
committed
Merge branch 'release/0.3'
2 parents f8ea3eb + 7c4cc65 commit 298514b

14 files changed

+627
-86
lines changed

‎AUTHORS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Authors are (ordered by first commit date):
2+
3+
- Vincent Driessen
4+
- Benedikt Böhm
5+
- Daniel Truemper
6+
- Jason L. Shiffer
7+
- Randy Merrill
8+
- Rick Osborne
9+
- Mark Derricutt
10+
11+
Portions derived from other open source works are clearly marked.

‎Changes.mdown

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
0.3:
2+
----
3+
Release date: **2010/07/22**
4+
5+
* New subcommands for `git flow feature`:
6+
- **checkout**:
7+
For easily checking out features by their short name. Even allows
8+
unique prefixes as arguments (see below).
9+
10+
- **pull**:
11+
This subcommand allows you to painlessly work on a feature branch
12+
together with another peer. This is especially valuable for doing
13+
peer reviews of other people's code. For more detailed info, see the
14+
[commit log][1].
15+
16+
* Easier addressing of branch names by using name prefixes.
17+
For example, when using:
18+
19+
git flow feature finish fo
20+
21+
this automatically finishes the feature branch `foobar` if that's the only
22+
feature branch name starting with `fo`.
23+
24+
* No force flag anymore for new feature branches
25+
`git flow feature start` lost its `-f` (force) flag. You now don't
26+
have to be in a clean repo anymore to start a new feature branch. This
27+
avoids the manual `git stash`, `git flow feature start`, `git stash
28+
pop` cycle.
29+
30+
* You can use `git-flow` in stand-alone repo's now.
31+
This means it does not assume you have an `origin` repository.
32+
(Thanks [Mark][2].)
33+
34+
* No commands fetch from `origin` by default anymore.
35+
There were some issues related to disabling this flag on some platforms.
36+
37+
* Init guesses branch names you may want to use for `develop` and `master`.
38+
39+
* Added super-easy installation script. (Thanks [Rick][3].)
40+
41+
* Added BSD license.
42+
43+
[1]: http://github.com/nvie/gitflow/commit/f68d405cc3a11e9df3671f567658a6ab6ed8e0a1
44+
[2]: http://github.com/talios
45+
[3]: http://github.com/rickosborne
46+
47+
48+
Older versions
49+
--------------
50+
No change history is recorded for pre-0.3 releases.

‎LICENSE

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Copyright 2010 Vincent Driessen. All rights reserved.
2+
3+
Redistribution and use in source and binary forms, with or without modification,
4+
are permitted provided that the following conditions are met:
5+
6+
1. Redistributions of source code must retain the above copyright notice,
7+
this list of conditions and the following disclaimer.
8+
9+
2. Redistributions in binary form must reproduce the above copyright notice,
10+
this list of conditions and the following disclaimer in the documentation
11+
and/or other materials provided with the distribution.
12+
13+
THIS SOFTWARE IS PROVIDED BY VINCENT DRIESSEN ``AS IS'' AND ANY EXPRESS OR
14+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
15+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
16+
SHALL VINCENT DRIESSEN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
17+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
18+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
19+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
20+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
21+
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
22+
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23+
24+
The views and conclusions contained in the software and documentation are those
25+
of the authors and should not be interpreted as representing official policies,
26+
either expressed or implied, of Vincent Driessen.

‎Makefile

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
#
2+
# Copyright 2010 Vincent Driessen. All rights reserved.
3+
#
4+
# Redistribution and use in source and binary forms, with or without
5+
# modification, are permitted provided that the following conditions are met:
6+
#
7+
# 1. Redistributions of source code must retain the above copyright notice,
8+
# this list of conditions and the following disclaimer.
9+
#
10+
# 2. Redistributions in binary form must reproduce the above copyright
11+
# notice, this list of conditions and the following disclaimer in the
12+
# documentation and/or other materials provided with the distribution.
13+
#
14+
# THIS SOFTWARE IS PROVIDED BY VINCENT DRIESSEN ``AS IS'' AND ANY EXPRESS OR
15+
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
16+
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
17+
# EVENT SHALL VINCENT DRIESSEN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
18+
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
19+
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20+
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21+
# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
22+
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
23+
# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24+
#
25+
# The views and conclusions contained in the software and documentation are
26+
# those of the authors and should not be interpreted as representing official
27+
# policies, either expressed or implied, of Vincent Driessen.
28+
#
129
prefix=/usr/local
230

331
# files that need mode 755

‎README.mdown

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ for Vincent Driessen's [branching model](http://nvie.com/git-model "original
55
blog post").
66

77

8-
> **IMPORTANT NOTE:**
9-
> In release 0.2, the order of the arguments has changed to provide a logical
10-
> subcommand hierarchy.
11-
12-
138
Installing git-flow
149
-------------------
10+
The easiest way to install git-flow is using Rick Osborne's excellent
11+
git-flow installer, which can be run using the following command:
12+
13+
$ wget -q -O - http://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | sudo sh
14+
15+
If you prefer a manual installation, please use the following instructions.
1516
After downloading the sources from Github, also fetch the submodules:
1617

1718
$ git submodule init
@@ -30,14 +31,42 @@ Or simply point your `PATH` environment variable to your git-flow checkout
3031
directory.
3132

3233

34+
Integration with your shell
35+
---------------------------
36+
For those who use the [Bash](http://www.gnu.org/software/bash/) shell, please
37+
check out the excellent work on the
38+
[git-flow-completion](http://github.com/bobthecow/git-flow-completion) project
39+
by [bobthecow](http://github.com/bobthecow). It offers tab-completion for all
40+
git-flow subcommands and branch names.
41+
42+
If you are a [zsh](http://www.zsh.org) user with some plugin-writing
43+
experience, please help us develop a
44+
[completion plugin](http://github.com/bobthecow/git-flow-completion/issues#issue/1)
45+
for zsh, too. Please contact me on [Github](http://github.com/inbox/new/nvie)
46+
or [Twitter](http://twitter.com/nvie) to discuss details.
47+
48+
3349
Please help out
3450
---------------
3551
This project is still under development. Feedback and suggestions are very
3652
welcome and I encourage you to use the [Issues
3753
list](http://github.com/nvie/gitflow/issues) on Github to provide that
3854
feedback.
3955

40-
Feel free to fork this repo and to commit your additions.
56+
Feel free to fork this repo and to commit your additions. For a list of all
57+
contributors, please see the [AUTHORS](AUTHORS) file.
58+
59+
Any questions, tips, or general discussion can be posted to our Google group:
60+
http://groups.google.com/group/gitflow-users
61+
62+
63+
License terms
64+
-------------
65+
git-flow is published under the liberal terms of the BSD License, see the
66+
[LICENSE](LICENSE) file. Although the BSD License does not require you to share
67+
any modifications you make to the source code, you are very much encouraged and
68+
invited to contribute back your modifications to the community, preferably
69+
in a Github fork, of course.
4170

4271

4372
Typical usage:

‎contrib/gitflow-installer.sh

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
#!/bin/sh
2+
3+
# git-flow make-less installer for *nix systems, by Rick Osborne
4+
# Based on the git-flow core Makefile:
5+
# http://github.com/nvie/gitflow/blob/master/Makefile
6+
7+
# Licensed under the same restrictions as git-flow:
8+
# http://github.com/nvie/gitflow/blob/develop/LICENSE
9+
10+
# Does this need to be smarter for each host OS?
11+
if [ -z "$INSTALL_PREFIX" ] ; then
12+
INSTALL_PREFIX="/usr/local/bin"
13+
fi
14+
15+
if [ -z "$REPO_NAME" ] ; then
16+
REPO_NAME="gitflow"
17+
fi
18+
19+
if [ -z "$REPO_HOME" ] ; then
20+
REPO_HOME="http://github.com/nvie/gitflow.git"
21+
fi
22+
23+
EXEC_FILES="git-flow"
24+
SCRIPT_FILES="git-flow-init git-flow-feature git-flow-hotfix git-flow-release git-flow-support git-flow-version gitflow-common gitflow-shFlags"
25+
SUBMODULE_FILE="gitflow-shFlags"
26+
27+
echo "### gitflow no-make installer ###"
28+
29+
case "$1" in
30+
uninstall)
31+
echo "Uninstalling git-flow from $INSTALL_PREFIX"
32+
if [ -d "$INSTALL_PREFIX" ] ; then
33+
for script_file in $SCRIPT_FILES $EXEC_FILES ; do
34+
echo "rm -vf $INSTALL_PREFIX/$script_file"
35+
rm -vf "$INSTALL_PREFIX/$script_file"
36+
done
37+
else
38+
echo "The '$INSTALL_PREFIX' directory was not found."
39+
echo "Do you need to set INSTALL_PREFIX ?"
40+
fi
41+
exit
42+
;;
43+
help)
44+
echo "Usage: [environment] gitflow-installer.sh [install|uninstall]"
45+
echo "Environment:"
46+
echo " INSTALL_PREFIX=$INSTALL_PREFIX"
47+
echo " REPO_HOME=$REPO_HOME"
48+
echo " REPO_NAME=$REPO_NAME"
49+
exit
50+
;;
51+
*)
52+
echo "Installing git-flow to $INSTALL_PREFIX"
53+
if [[ -d "$REPO_NAME" && -d "$REPO_NAME/.git" ]] ; then
54+
echo "Using existing repo: $REPO_NAME"
55+
else
56+
echo "Cloning repo from GitHub to $REPO_NAME"
57+
git clone "$REPO_HOME" "$REPO_NAME"
58+
fi
59+
if [ -f "$REPO_NAME/$SUBMODULE_FILE" ] ; then
60+
echo "Submodules look up to date"
61+
else
62+
echo "Updating submodules"
63+
lastcwd=$PWD
64+
cd "$REPO_NAME"
65+
git submodule init
66+
git submodule update
67+
cd "$lastcwd"
68+
fi
69+
install -v -d -m 0755 "$INSTALL_PREFIX"
70+
for exec_file in $EXEC_FILES ; do
71+
install -v -m 0755 "$REPO_NAME/$exec_file" "$INSTALL_PREFIX"
72+
done
73+
for script_file in $SCRIPT_FILES ; do
74+
install -v -m 0644 "$REPO_NAME/$script_file" "$INSTALL_PREFIX"
75+
done
76+
exit
77+
;;
78+
esac

‎git-flow

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,37 @@
44
# repository operations for Vincent Driessen's branching model.
55
#
66
# Original blog post presenting this model is found at:
7-
# http://nvie.com/archives/323
7+
# http://nvie.com/git-model
88
#
99
# Feel free to contribute to this project at:
1010
# http://github.com/nvie/gitflow
1111
#
12-
# Copyright (c) 2010 by Vincent Driessen
13-
# Copyright (c) 2010 by Benedikt Böhm
12+
# Copyright 2010 Vincent Driessen. All rights reserved.
13+
#
14+
# Redistribution and use in source and binary forms, with or without
15+
# modification, are permitted provided that the following conditions are met:
16+
#
17+
# 1. Redistributions of source code must retain the above copyright notice,
18+
# this list of conditions and the following disclaimer.
19+
#
20+
# 2. Redistributions in binary form must reproduce the above copyright
21+
# notice, this list of conditions and the following disclaimer in the
22+
# documentation and/or other materials provided with the distribution.
23+
#
24+
# THIS SOFTWARE IS PROVIDED BY VINCENT DRIESSEN ``AS IS'' AND ANY EXPRESS OR
25+
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
26+
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
27+
# EVENT SHALL VINCENT DRIESSEN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
28+
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
29+
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
30+
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
31+
# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
32+
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
33+
# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34+
#
35+
# The views and conclusions contained in the software and documentation are
36+
# those of the authors and should not be interpreted as representing official
37+
# policies, either expressed or implied, of Vincent Driessen.
1438
#
1539

1640
# enable debug mode
@@ -78,11 +102,4 @@ main() {
78102
cmd_$SUBACTION "$@"
79103
}
80104

81-
# helper functions for common reuse
82-
max() { if [ "$1" -gt "$2" ]; then echo "$1"; else echo "$2"; fi; }
83-
84-
# convenience functions for checking whether flags have been set or not
85-
flag() { eval FLAG=\$FLAGS_$1; [ $FLAG -eq $FLAGS_TRUE ]; }
86-
noflag() { eval FLAG=\$FLAGS_$1; [ $FLAG -ne $FLAGS_TRUE ]; }
87-
88105
main "$@"

0 commit comments

Comments
 (0)