Skip to content
This repository was archived by the owner on Oct 14, 2025. It is now read-only.

pull new #6431

Closed
wants to merge 108 commits into from
Closed

pull new #6431

Changes from 1 commit
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
baf66be
Merge branch 'release/0.4.1' into develop
nvie Feb 14, 2011
023ed69
Add an installer for the msysgit environment
dolmen Mar 20, 2011
b52f79e
Update README for msysgit to use the new installer
dolmen Mar 20, 2011
8f280e0
Fixed require_tag_absent to not break when the list of tags contains …
jezdez Mar 28, 2011
f6fcc4e
- Removed quoting in has $SOME_BRANCH $(get_remote_branches), as the …
Apr 14, 2011
2074360
release: start subcommand takes an optional base as well
Apr 15, 2011
f1b3213
Merge branch 'develop' of https://github.com/kostiklv/gitflow into de…
nvie Apr 17, 2011
2f05c3c
Add Konstantin Tjuterev to the list of contributors.
nvie Apr 17, 2011
499b468
Merge branch 'develop' of https://github.com/jezdez/gitflow into develop
nvie Apr 17, 2011
e024fa4
Add Jannis Leidel to the list of contributors.
nvie Apr 17, 2011
a7a89cd
Fix always-empty value for $DOT_GIT_DIR variable.
nvie Apr 17, 2011
fff16ed
Set GITFLOW_DIR correctly if git-flow is a symbolic link
jbernard Apr 23, 2011
ca475ab
Add debian/ubuntu packaging.
kiall Apr 25, 2011
6fc1323
Fixing some minor mistakes in debian/control metadata - followup to c…
kiall Apr 25, 2011
96e3e3f
Merged pull request #120 from kiall/develop.
nvie Apr 26, 2011
7e583b5
Moved the debian stuff to the contrib directory.
nvie Apr 26, 2011
d762995
Add Kiall Mac Innes to the list of contributors.
nvie Apr 26, 2011
a64939d
Merged pull request #119 from jbernard/develop.
nvie Apr 26, 2011
f9ace1f
Add Jon Bernard to the list of contributors.
nvie Apr 26, 2011
3626bfb
Revert "Set GITFLOW_DIR correctly if git-flow is a symbolic link"
nvie Apr 27, 2011
9720b66
Merge pull request #109 from dolmen/feature/msysgit-install
nvie May 10, 2011
b7fc886
Add Olivier Mengué to the list of contributors.
nvie May 10, 2011
c4b4b3c
Make room for new minor release (and update the changelog).
nvie May 16, 2011
cf5b2a5
Implement git flow feature finish without a branch name to finish the
nvie May 16, 2011
59e6aef
Update usage docs and changelog.
nvie May 16, 2011
8b73fed
Update the changelog.
nvie May 16, 2011
14bcc58
Update the version number to distinguish HEAD from the released 0.4.1…
nvie May 23, 2011
26293bb
This script depends on Bash-only features, and so should not be execu…
Jun 14, 2011
0191c68
Merge pull request #132 from kwasticat/develop
nvie Jun 14, 2011
06e854a
Fix parsing for Bourne shell (FreeBSD)
kixx Jul 6, 2011
e73a1d9
Adding windows install step for libintl3.dll
MarkBorcherding Jul 8, 2011
3d12772
Merge pull request #138 from MarkBorcherding/feature/windows-install-…
nvie Jul 11, 2011
7c7dc35
Merge branch 'develop' of https://github.com/kixx/gitflow into develop
nvie Jul 11, 2011
0c32062
fixed malformed if statement
Jul 26, 2011
be5dabf
Merge pull request #141 from moranjk/develop
nvie Jul 27, 2011
1b454cc
Replace contrib/debian/ with a note on how to install on Debian.
algernon Aug 25, 2011
05c4dbc
Adding the `eval` to force variable expansion.
Zoramite Oct 14, 2011
d0df88d
Adding the variable expansion to the hotfix.
Zoramite Oct 14, 2011
9c5c806
added a -D flag to the git flow finish command to try extra hard to d…
chad3814 Oct 25, 2011
0b324de
add publishing to hotfix
phoet Nov 12, 2011
4895c15
Fix wording.
nvie Nov 23, 2011
447808f
Merge branch 'chad3814-develop' into develop
nvie Nov 23, 2011
7cbdb84
Merge pull request #163 from phoet/publish_hotfix
nvie Nov 23, 2011
766159d
Add a cool new video tutorial on git-flow by Build a Module.
nvie Nov 24, 2011
62c339e
develop_branch uses origin/develop_branch as start-point if one exists.
emreberge Nov 28, 2011
0d00b69
Add Changelog note and added Emre to list of contributors.
nvie Nov 28, 2011
baf163e
Check if a remote master branch exists before die, track it if no loc…
ejholmes Nov 29, 2011
938ea5f
Add information for contributing.
ejholmes Nov 29, 2011
ba0cc8a
Add --recursive.
ejholmes Nov 29, 2011
921ddf5
Add Eric Holmes to list of contributors.
nvie Nov 29, 2011
49305ec
Rewrote Eric's text a bit.
nvie Nov 30, 2011
b4626cb
Merge branch 'develop' of github.com:nvie/gitflow into develop
nvie Nov 30, 2011
4b9545e
Add a proposal for our Windows users.
nvie Nov 30, 2011
5e8cc9f
Oops, forgot about spaces in the dirname.
nvie Dec 1, 2011
083a588
Better support for the Windows platform, where backslashes are dominant.
nvie Dec 1, 2011
72594ea
Merge branch 'feature/convert-slashes' into develop
nvie Dec 1, 2011
e856e0a
fixed the installer in msysgit environment to work with windows XP
sjaeckel Dec 6, 2011
6107f88
Merge pull request #172 from sjaeckel/develop
nvie Dec 6, 2011
c02c12d
Updated Cygwin section with possibly missing package.
Dec 6, 2011
e8c88c0
Merge pull request #173 from AlexZeitler/patch-1
nvie Dec 6, 2011
07dacd5
Moved all installation instructions to the Wiki.
nvie Dec 6, 2011
5a58633
Documented init -d flag and publish/pull
Dec 20, 2011
905cfb1
whitespace
Dec 20, 2011
6158d51
Added a -r flag to git-flow-feature-pull to support pull with rebase
vedang Jan 30, 2012
3b86dd3
install from my github repo
vedang Jan 30, 2012
afbf92c
Updating the escape characters to fix an issue with having a + in the…
Zoramite Feb 8, 2012
f66eba8
Merge branch 'develop' into feature/Issue50
Zoramite Feb 8, 2012
ee27210
Merge pull request #195 from Zoramite/feature/Issue148
nvie Feb 13, 2012
bb1becd
Merge pull request #178 from lorin/feature/docs
nvie Feb 13, 2012
adfd408
Merge pull request #160 from Zoramite/feature/Issue50
nvie Feb 13, 2012
56bff9a
Added a -r flag to git-flow-feature-pull to support pull with rebase
vedang Jan 30, 2012
7384052
Fix indenting.
nvie Feb 13, 2012
53cfc35
Add Vedang to AUTHORS.
nvie Feb 13, 2012
679f05f
Remove the "still maintained" banner.
nvie Feb 13, 2012
f608281
set EXPR_COMPAT=1 if running inside freebsd so shFlags works correctly
putermancer Jan 6, 2012
cc5e9a5
Update the Changelog.
nvie Feb 13, 2012
ab7fda2
Merge branch 'debian-installer' into develop
nvie Feb 14, 2012
37f7d14
Added a track command to git-flow-hotfix along the lines of the git-f…
vedang Mar 12, 2012
51011ac
make the installer for msysgit search in ~/bin as well
sjaeckel Mar 14, 2012
afb191f
Fixes #206
Apr 9, 2012
6fa8fed
Release finish squash parameter
mykehsd Apr 19, 2012
75fbdd7
Feature finish squash parameter
mykehsd Apr 19, 2012
dc902ed
Added 'init()' function to git-flow-{feature,release,hotfix,support},…
pcragone Apr 21, 2012
6606678
Updated from upstream
vedang May 1, 2012
ad511b6
Merge branch 'develop' into feature/hotfix-tracking
vedang May 1, 2012
a223c3a
fixed small bug in line 510, 'it' instead of 'git'
May 31, 2012
12c2a9c
fixes pull existing feature from remote.
Jun 1, 2012
2632778
Fix init -d behaviour when master branch exists, and one or more othe…
sinbad Jun 5, 2012
2e9ab49
Support reading the tag message from a file in release/hotfix finish
sinbad Jun 9, 2012
9c48e05
Fix broken link to original blog-post
jasom Jul 3, 2012
c26286e
Merge pull request #222 from sinbad/feature/fix_default_behaviour
nvie Jul 9, 2012
662bcd6
Merge pull request #223 from sinbad/feature/tagmessagefromfile
nvie Jul 9, 2012
392ed79
Merge pull request #227 from jasom/develop
nvie Jul 9, 2012
b1cc495
Merge pull request #220 from memleak/patch-1
nvie Jul 9, 2012
c072ff6
Merge pull request #219 from kperi/develop
nvie Jul 9, 2012
f414f0c
Merge pull request #211 from pcragone/develop
nvie Jul 9, 2012
0c4d0bf
Cleanup (mostly whitespace issues).
nvie Jul 9, 2012
fda5507
Merge branch 'develop' into squash-option
nvie Jul 9, 2012
805d245
Credit where credit is due.
nvie Jul 9, 2012
c7e50ee
Revert unnecessary changes.
nvie Jul 9, 2012
76ec133
Revert changes installer location.
nvie Jul 9, 2012
a2f53f9
Merge branch 'develop' into track-for-hotfix
nvie Jul 9, 2012
aec4818
Merge pull request #201 from sjaeckel/feature/msysInstall
nvie Jul 9, 2012
aa93d23
Be git-describe friendly.
nvie Jul 9, 2012
b72a395
Prevent error message on git flow init
Jul 10, 2012
53e9c76
Merge pull request #235 from oddnoc/feature/112-init-fix
nvie Jul 10, 2012
5bca8d9
Create a git_do command to log git actions
jeromebaum Sep 25, 2012
15aab26
Use git_do where appropriate
jeromebaum Sep 25, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add Jannis Leidel to the list of contributors.
  • Loading branch information
@nvie
nvie committed Apr 17, 2011
commit e024fa451d38d0c78d599adafe332252e8a1c9c3
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Authors are (ordered by first commit date):
- Felipe Talavera
- Guillaume-Jean Herbiet
- Joseph A. Levin
- Jannis Leidel
- Konstantin Tjuterev

Portions derived from other open source works are clearly marked.