petervanderdoes / gitflow-avh

AVH Edition of the git extensions to provide high-level repository operations for Vincent Driessen's branching model
http://nvie.com/posts/a-successful-git-branching-model/
Other
5.42k stars 528 forks source link

How customize git flow to add new custom git command? #320

Open SocFoot opened 7 years ago

SocFoot commented 7 years ago

Hello, I really like git flow, and I would be interested in forking it. I mostly want to have short cut of git command following git flow mantra. So I have a transparent tool / best practices/ custom features. Should I fork your project or just use git short cut system? My problem is that i'm not a shell expert so can't really see if forking your project can be done easily. Is there an easy way to add shortcut to yours in Git Flow?

petervanderdoes commented 7 years ago

What exactly do you mean with "to have short cut of git command"?

SocFoot commented 7 years ago

Thanx for the response. I meant just using git aliases. From my stand point i can't see the difference between your app and just Aliases, so i don't really know how to choose.

petervanderdoes commented 7 years ago

Most of it can't be done in just Git aliases and that would be mostly because of flags used in commands.

For example: git flow feature finish The following steps are done in that process:

And that's just without any optional work, like do we delete or keep the feature branch, do you want to rebase the feature branch before merging, do you want to merge regular, fast forward, or squash the feature branch the base branch.

dmlsthe1 commented 4 years ago

I have the same question as OP. I want to incorporate git flow for work so everything stays up to date with easy commands for everyone. The only problem is we code review and use branch permissions that don't allow pushing directly to develop or master. So we can only merge into those branches using Pull Requests. What I was hoping to do is create a custom feature flow. Upon running git flow feature finish...

  1. (Optional) rebase from base
  2. push to remote
  3. checkout base
  4. (Optional) Delete local feature branch
  5. Echo link to create PR

Currently because I don't like keeping unused branches I've been doing the following steps when I'm ready (feature finished)...

  1. git pull --rebase origin
  2. git push origin
  3. create PR
  4. git checkout -b origin/develop
  5. git branch -D