Git: Generate patch of all commits made on "feature" branch without referring to commit IDs -


we maintain 2 versions of our application in 2 branches: free , master (master being premium version of our application). these branches similar master branch has few application features free version doesn't, need maintain 2 branches ongoing.

regularly need fix bugs or add features free branch, need have applied master branch when they're done. when have such work do, i'll start new branch based on free called, example, newfeature. when i'm done feature, newfeature has x new commits.

before merge newfeature free i'd know command can use generate patch commits contained in newfeature need applied master. currently, i'm doing this:

git format-patch aa99f9..e94904

as far know how do, have specific commit ids of when branched newfeature, , last commit in newfeature, drag. i'm not interesting in commit ids , don't want have type them in.

i want there single command can consistently use in git figure out commits i'm talking about. it's same pattern every time: given branch newfeature, want generate patch of commits common ancestor of newfeature , free latest commit on newfeature.

is there changeset expression out there obviate need manually commit ids?

p.s.: afaik, cannot use git rebase task because merge entire free branch onto master. want merge commits unique newfeature branch onto master.

specifically you're asking is:

git format-patch `git merge-base newfeature free`..newfeature

you save time doing this:

git checkout master git cherry-pick `git merge-base newfeature free`..newfeature

depending on workflow, might have create patch before merge in feature. i.e.:

git checkout newfeature git rebase free git format-patch free

it sound workflow improved basing premium off of free , merging free features premium branch.


Comments

Post a Comment

Popular posts from this blog

java - Play! framework 2.0: How to display multiple image? -

i need display gallery of photos. here template: @(photos: list[photo]) @title = { <bold>gallery</bold> } @main(title,"photo"){ <ul class="thumbnails"> @for(photo <- photos) { <li class="span3"> <a href="#" class="thumbnail"> <img src="@photo.path" alt=""> </a> </li> } </ul> } and here controller method: public static result getphotos() { return ok(views.html.photo.gallery.render(photo.get())); } and here photo bean : @entity public class photo extends model { @id public long id; @required public string label; public string path; public photo(string path, string label) { this.path = path; this.label = label; } private static finder<long, photo> find = new finder<long, photo>( long.class, photo.class); public static list<phot...
Read more

gmail - Is there any documentation for read-only access to the Google Contacts API? -

i want read-only access user's google contacts. there stackoverflow member wanted this, , received following answer : yes, there is, use https://www.googleapis.com/auth/contacts.readonly scope , "view contacts". this exchange reference read-only access google contacts can find using google. simply using access token obtained attempt read usual google contacts api (i.e. https://www.google.com/m8/feeds ) fails insufficient permissions. similarly, using google contacts api on new target fails 404 errors (for example https://www.googleapis.com/auth/contacts.readonly/default/full ). is there documentation anywhere on how use api, or permissible way access google contacts api full read-write access?
Read more

php - Controller/JToolBar not working in Joomla 2.5 -

relevant code: jtoolbarhelper::custom('savecategories', 'save', '', 'save', false, false); ... <input type="hidden" name="controller" value="easyblogcontroller"> according can dig docs , own previous questions, should call savecategories() function in easyblogcontroller . i've tried setting value easyblog , easyblog.php (file name) current easyblogcontroller (class name). clicking on save button refreshes page. not redirect, echo or var_dump test code put in savecategories() function. var_dump ing jrequest::getvar('controller') , 'task' return correct values. creating controller object , using $controller->execute('task'); works. the values going depend on location of controller trying call, , have couple options here. typically there controller in base folder of component (likely components/com_easyblog) in file called controller.php , class name inside ...
Read more