guberm / tortoisegit

Automatically exported from code.google.com/p/tortoisegit
0 stars 0 forks source link

Enhancement request - gitflow support #992

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago
Enhancement 246 has a different take on this (custom command alias appearing on 
the context-menu).  I'm opening this separately to see if directly 
incorporating git-flow is an option.  For some reason, my team believes 
command-line tools to be evil - and incorporating this incredibly useful tool 
into tortoiseGit would be fantastic.

Original issue reported on code.google.com by dngre...@gmail.com on 5 Dec 2011 at 3:44

GoogleCodeExporter commented 9 years ago
I second your request for git-flow in Tortoise. I also work in an environment 
where command-line tools frowned upon and Tortoise is widely used. Lack of GUI 
support is a barrier to adption of git-flow in our environment.

Original comment by chris.br...@gmail.com on 6 Dec 2011 at 6:18

GoogleCodeExporter commented 9 years ago
Wouldn't it be better if they included the ability for custom aliases? Git flow 
works for some but not others we use Github flow for deploying websites 
http://scottchacon.com/2011/08/31/github-flow.html

So it seems that it would be better if everyone could define their own custom 
aliases and context menus to support their own workflow... Here is a quick 
Alias breakdown for the Github workflow:

[alias]
  c = commit -am
  a = add -A
  co = checkout
  new = !sh -c 'git checkout master && git fetch origin && git merge --ff origin/master && git checkout -b $1 master && git push -u origin $1'
  up = !git fetch origin && git rebase -p origin/master
  ir = !git rebase -i origin/master
  next = !git add -A && git rebase --continue
  done = !git fetch origin && git rebase -p origin/master && git push
  stage = !sh -c 'git checkout master && git merge --no-ff $1 && git fetch origin && git rebase -p origin/master && git push'
  deploy = !sh -c 'git checkout master && echo $1 > tag && git tag -a $1 -m $2 && git fetch origin && git rebase -p origin/master && git push --tags origin master'
  fix = 1sh -c 'git checkout -b $1 master && git fetch origin && git rebase -p origin/master'
  fixed = !git fetch origin && git rebase -i origin/master && git push origin master
  rmb = !sh -c 'git branch -D $1 && git push origin :$1' -
  l = log --graph --pretty=format:'%Cblue%h%d%Creset %ar %Cgreen%an%Creset %s'

most of these aliases are self explanatory with a couple exceptions:
git new <new branch name> will update master then create a new branch then push 
it to origin
git fix <new branch name> will update master then create a new branch
git stage <branch name>
git deploy <release> "<release description>" eg: git deploy v1.0.3 "Release 
v1.0.3 - Release name: Funky Monkey"
git rmb <branch name>  will removed a branch both locally and remotely when it 
is no longer needed

Original comment by SMa...@gmail.com on 24 Dec 2011 at 12:29

GoogleCodeExporter commented 9 years ago
@comment 2 - as mentioned, enhancement req 246 kind of covers adding generic 
aliases- I added this request to separate out git flow from the other one...

Original comment by dngre...@gmail.com on 24 Dec 2011 at 5:02

GoogleCodeExporter commented 9 years ago
There are a lot of good workflows for git, git flow and github flow being some 
of them. 

I was thinking that it would be unreasonable and probably stupid for them to be 
in the main path of development for TGit, since you can do everything they do 
with Tgit, it just takes several commands. 

My feeling is that they should probably be integrated as plugins to TGit. 

This would probably require some interfaces to be developed and perfected in 
order to allow plugins to interact with repos. 

What do others think?  

Original comment by pro-lo...@optusnet.com.au on 25 Dec 2011 at 2:44

GoogleCodeExporter commented 9 years ago

Original comment by sstrickr...@googlemail.com on 12 Aug 2012 at 4:10

GoogleCodeExporter commented 9 years ago
+1 for implementing git flow as a TGit plugin

Original comment by x...@studioartlan.com on 18 Oct 2012 at 8:03

GoogleCodeExporter commented 9 years ago
+1 for implementing git-flow as a TGit plugin.
Other plugins like github flow should be possible to add.

Q: Or is there a possibility to use a "hook" which allows to trigger a cmd 
script?

Original comment by subscr...@halbehalbe.ch on 24 Dec 2012 at 10:41

GoogleCodeExporter commented 9 years ago

Original comment by ch3co...@gmail.com on 29 Mar 2013 at 4:01

GoogleCodeExporter commented 9 years ago
no git-flow support in TGit,now i will try sourcetree

Original comment by jianfeng...@gmail.com on 30 Jul 2014 at 9:56