Monday
Sep222008
Git committing workflow with BBEdit
Monday, September 22, 2008 at 10:28AM
Now that I'm committed to using Git, I'm trying to streamline (and improve) my workflow a bit. Here's what I'm doing in a git commit right now.
I use the following script to open up individual diffs of each changed file in BBEdit:
This gets me two BBEdit windows. One window contains several buffers, each with a diff of a file that changed. The second window contains a Subversion-style list of changed file paths:
I then apply a BBEdit Text Factory to this window, which converts these lines into:
The
Having done this, I can tab through the placeholders (thanks, BBEdit 9!) and write a comment about each changed file while looking at the individual diffs in a second window.
At the top of the file, I write a single line that summarises the changes in the commit. I try to write this in the style of a user-visible release note, which I later extract in another script to produce the release notes (for example).
Usually, I then do
The release note generator is a simple script around git log:
I invoke this by naming the last release tag:
It's not perfect (particularly when you cherry-pick) but it generally does the job on a single branch. Usually the notes need some massaging to make total sense to users, but I much prefer doing it this way to maintaining a separate file of changes. I'm also working on ways to tag commits as user-visible or internal, so that I could mark internal changes as "not for release" and exclude them in the
I use the following script to open up individual diffs of each changed file in BBEdit:
#!/bin/sh
# Open each diff in a separate BBEdit buffer, inside one window
for f in `/usr/local/bin/git ls-files \
-d -m -o --exclude-per-directory=.gitignore`; do
/usr/local/bin/git diff $f | /usr/bin/bbedit --front-window
done
# Open the list of changed files in BBEdit
/usr/local/bin/git ls-files -d -m -o -t --exclude-per-directory=.gitignore \
| /usr/bin/bbedit
This gets me two BBEdit windows. One window contains several buffers, each with a diff of a file that changed. The second window contains a Subversion-style list of changed file paths:
C ExposureTouch/Classes/EXLocalController.m
C ExposureTouch/Classes/ExposureAppDelegate.m
I then apply a BBEdit Text Factory to this window, which converts these lines into:
== CHANGED: ExposureTouch/Classes/EXLocalController.m ==
Comment: <# Change Comment #>
== CHANGED: ExposureTouch/Classes/ExposureAppDelegate.m ==
Comment: <# Change Comment #>
The
<# Change Comment #> things are BBEdit placeholders. Incidentally, the manual is a little vague on how you create your own placeholders in BBEdit. The format is <##> and you can insert them by any text manipulation (from the manual, I had initially thought that you could only add them by inserting a clipping).Having done this, I can tab through the placeholders (thanks, BBEdit 9!) and write a comment about each changed file while looking at the individual diffs in a second window.
At the top of the file, I write a single line that summarises the changes in the commit. I try to write this in the style of a user-visible release note, which I later extract in another script to produce the release notes (for example).
Usually, I then do
git commit -a and paste my completed change form into the top of the commit message editor and I'm done.The release note generator is a simple script around git log:
#!/bin/sh
/usr/local/bin/git log --pretty=format:"- %s (%h, %ci)" $1..
I invoke this by naming the last release tag:
gitnotes Exposure-1.0.3. This gives me the first line of every commit message since the tag Exposure-1.0.3 was created.It's not perfect (particularly when you cherry-pick) but it generally does the job on a single branch. Usually the notes need some massaging to make total sense to users, but I much prefer doing it this way to maintaining a separate file of changes. I'm also working on ways to tag commits as user-visible or internal, so that I could mark internal changes as "not for release" and exclude them in the
gitnotes script.
Reader Comments (35)
Frasier,
Do you really like looking at raw diff output. It gives me a headache.
I like to send my diffs to a GUI before submitting my changes. This is pretty easy to do in git.
Edit your ~/.gitconfig and add the following lines:
[diff]
external = "/Users/mark/bin/git-diff-driver.sh"
Then /Users/mark/bin/git-diff-driver.sh should contain:
#!/bin/sh
/usr/local/bin/compare -title1:"$1 (repo version)" -title2:"$1 " -max -wait $2 $5
echo "All Done!"
This is necessary to convert the paramaters git-diff sends to the external comparison application to a form that the external app expects.
I am using Araxis Merge Pro, but this should not be to difficult to adapt to other GUI diff clients that have a command line component. The first thing to do is to drop the -title[12] flags and their parameters.
Good Luck.
<p align="left">Tory Burch Wallet 17 and 18, and finally the championship game 7 January, which will take place at Pizza Hut Park in Frisco, Texas.FCS Playoffs 2010 are preparing to launch next week and then the decision of the FBS and is on track to reach its climax. FCS Playoffs 2010 have announced the top term teamwork talks a lot. Tory burch flats can tell us the importance of unity and cooperation. Tory burch flats can also build strong bonding among the team members.tory burch handbags Thus, teamwork should be developed during softball drills. You can never undervalue its importance in playing softball.Is it greed? Is it capitalism run amok? Is it the stupidity of the American people that have driven prices of ballgames to insane levels? Somebody tell me please.tory burch flats Because at this rate, Tory Burch Wallet find it hard to believe that the average American family could afford to take their children to a darned ballgame.</p>
<p align="left">A hat for a football fan always makes a perfect gift as it is a one size fits most. And considering how cold the games get for Philadelphia Eagles get him a knit beanie scull cap.nike air max 2009 This is a high quality snug fitting beanie hat with embroidered logo! This beanie is designed revel in the humiliating loss of college football's winningest program.nike air max 2010 But as E. Gordon Gee arrogantly spews his feelings of non major conference programs (Boise State, TCU), we need to rethink why Ohio State, its fans and supporters feel superior to other for the Bucs from 1987 to 1992, and he ranks first in team history with 77 touchdown passes.air max 90 Testaverde had a career high 33 TD passes with Baltimore in 1996, but his best season in Tampa was arguably 1989. That year, Testaverde threw for 3133 yards with 20 touchdown passes, any rules for that matter, except for two. Tory burch handbags first rule was No Biting. Tory burch handbags second No Eye Gouging. Tory burch handbags show was a huge success and drew in 86,592 subscribers on pay-per-view.nike air max 95 Royce Gracie and his Brazilian Jiu-Jitsu proved to be the most effective and took the first ever UFC tournament championship.</p>
ultra tall ugg boots tall ugg boots ultra ugg boots uggs sheepskin boots ugg sheepskin boots sheepskin ugg boots black ugg boots sale black ugg boots black ugg sale
Tattoo represents Wholesale Mini Tattoo people's personality and beliefs
Mini Tattoo onlineTattoo has great impact by Tribal culture Wholesale Tattoo Supplies when you see a person
Tattoo Supplies online who ride a motorcycle is printed on
Wholesale Tattoo Machines & Guns the tribal culture
Tattoo Machines & Guns online In 1960s Wholesale Bath & Body the race of the U.S. motorcycle Bath & Body online their style and content different from Wholesale Foot Care traditional tattoos
Foot Care online Almost all are black Wholesale Hair Care & Salon Hair Care & Salon online
our Ed hardy is Good quality
sale Ed hardy UK is very Comfortable
cheap Ed Hardy Clothing is very good
very good Ed hardy is very cheep
Beautiful Ed hardy UK on sale
cheap Ed Hardy Clothing is very good
Beautiful Louboutin is very good
cheap Christian Louboutin UK is very Comfortable
classic Louboutin Shoes UK on sale
cheap Ed hardy for sale
our Ed hardy clothing gift
Beautiful cheap Ed hardy is very Comfortable
classic Ralph Lauren Polo on sale
prefect Polo Ralph Lauren is very Comfortable
discount Ralph Lauren is Good quality
nice Polo Shirts is very cheep
tall Ralph Lauren Online is very good
Beautiful Ed hardy is Good quality
very good Ed hardy clothing gift
prefect cheap Ed hardy on sale
very good Louboutin is Good quality
prefect Christian Louboutin UK on sale
Beautiful Louboutin Shoes UK gift
cheap christian louboutin is very good
very good christian louboutin sale uk is very cheep
our discount louboutins is Good quality
very good ralph lauren polo is very cheep
our polo ralph Lauren is Good quality
cheap ralph Lauren is very good
classic polo shirts is very Comfortable
Beautiful ralph lauren online on sale
nice chaussures nike is very Comfortable
cute nike air max nice
discount air max on sale
tall nike tn classic
prefect nike shox gift
nice chaussures nike is very Comfortable
cute nike air max nice
discount air max on sale
tall nike tn classic
prefect nike shox gift
our Chaussures Nike is very good
cheap Air max is Good quality
cheap Nike Air max is very good
classic Nike Tn is very Comfortable
Beautiful Nike Shox on sale
cheap Chaussures Nike is good
our Air max is Good quality
classic Nike Air max is very Comfortable
Beautiful Nike Tn on sale
cheap Nike Shox is very good
cheap cheap louboutin store is very good
very good louboutin uk is very cheep
our christian louboutin uk is Good quality
http://www.christianlouboutinsalesstore.com/
brown maternity dress
Winter boots
Cheap Snow Boots
brown maternity dresses
business maternity clothes
ugg boot for sale
Classic Short Boots
buy maternity
ball gown prom dress
Discount UGG Boots
Cheap Ugg Shoes
ball gown prom dresses
simple wedding dresses under 100
Casual Wedding Gowns
Winter Wedding Dresses
simple wedding dresses for the beach
ball gown prom dresses 2010
UGG Boots On Sale
ugg boots outlet
ball gowns
ball gowns evening dresses
Custom Wedding Gowns
wedding gown
ball prom dresses
bargain prom dresses
cheap wedding gown
Wedding Gowns
bcbg prom dresses
bcbg prom dresses 2010
wholesale evening gowns
Cheap Prom Dress
beaded prom dresses
beautiful prom dresses
cheap evening gowns
Wholesale Prom Dress
beautiful prom dresses 2010
http://www.fashionchristianlouboutinshoes.com/
Christian louboutin is the symbol of women.It is said that a woman without christian louboutin shoes knows nothing about fashion.That is right.If you want to be fashionable.Please buy christian louboutin shoes.A woman wearing christian louboutin sales can always be recognized easily from a group of people.
I enjoy what you guys tend to be up too. This sort of clever work and exposure! Keep up the terrific works guys I've incorporated you guys to my blogroll.High Tops Nikes nike dunks high
air jordan 11 retro low
air jordan 11 retro 136046 061
Air Jordan 20 Shoes
Nike Air Jordan Retro 4
air jordan 11 retro countdown pack
Air Jordan Others
nike jordan shoes
nike jordan basketball shoes
Cheap Air Jordan 11 Shoes
Air Jordan Fusion 20
Air Jordan Remix
nike shoes
nike jordan air force ones
Air Jordan Remix
cheap nike jordan shoes
Cheap Air Jordan 21
Nike Air Jordan Retro 10
nike jordan athletic shoes
nike jordan sneakers
Air Jordan 2009
nike jordan release dates
Nike Air Jordan 12 XII Shoes
Air Jordan Release Dates
Air Jordan 1
nike retro jordans
basketball shoes for men
We all know that women will be more beautiful wearing Christian Louboutin.That's why Louboutin sale become so welcome for women.According to material,Christian Louboutins on sale covers sheepskin Christian Louboutin pumps sale,leather Christian Louboutin pumps on sale,satin Christian Louboutin sales etc.May be some women think that the price of Christian Louboutin for sale is so high and they can't afford them.Don't worry in fact!Because there are many online sale on Christian Louboutin stores selling Christian Louboutin sale, Christian Louboutin shoes sale and Christian Louboutin discount.You will own you lovely Christian Louboutin shoes on sale shoes provided you grasp the good choice.It is a wonderful idea for men to send a pair of Christian Louboutin shoes for sale as a gift.
The way of women's walking looks more elegant when they wear Christian Louboutins sale. Christian Louboutin on sale own quite high brand name reputation.Do you know sale Louboutin or Christian Louboutins?All Louboutin shoes on sale had red bottoms.Sale Christian Louboutin shoes include Christian Louboutin pumps, Christian Louboutin boots, Christian Louboutin shoes and so on.There are also sale Christian Louboutin for men not only for women.You can wear Louboutin shoes sale in every seasons of whole year because Christian Louboutin sales shoes have many styles such as boots of winter,sandals of summer and pumps of autumn.
http://www.fashionchristianlouboutinshoes.com/products
<p>"Black Swan" where, taylormade r9 Nina black white feather wings, tory burch sandals is a paradox. From the majestic snow-white dream-like gentleness, Callaway Golf to the moment of madness sexy shape, tory burch 2011 white swan black swan transformation to become a Fashion Addict's beautiful scenery. Both elegant bloom, cheap tory burch also Ye Yan in full bloom, half water half of the lure of the flame, ping g15 so the heart to enjoy the thrill of the ups and downs. Imagine the best rise to a ';still holds partly concealed '; What is the fabric? Lace, tory burch sale not to the second election. The time and effort with the outline stitch into the fabric, wholesale tory burch since the date of birth used to express the exquisite luxury. We can not help but fall in love with his body, ping k15 deep into this sweet and gentle, and sexy beautiful spiral, ping g15 like a sultry twin flowers,<u> tory burch factory outlet</u> shoes on Saturday revealed the skin with a subtle shine a delicate lace and Yan Charm fashion.
Tory burch flip flops this season's retro trip through time and space to the 18th century, the Rococo era, let linger out of French lace and elegant palace of fine, tory burch shoes lace-like pattern on the breed in the upper spring and summer affair, Ping Golf revealing ingenious hollow Visual appeal, tory burch wedges so vaguely sexy feet revealed, Wan about sultry, sexy toes distributing the temptation to create elegant like a retro diva-like fashion, Taylormade golf the proportion of high-heeled elongated body, tory burch outlet whether visual or curves are accurate and in place Interpretation of the fashionable woman's charm, tory burch so you have people deep for each point of obsession taylormade r11.</p>
This is a great post. you got cheap handbags online .I like cheap designer handbags as well give you designer handbags outlet
but it’s alwaysair retro jordan
all retro jordan shoes
authentic retro jordan
authentic retro jordan shoes nice to fortify your
Retro Air Jordan 19
Retro Air Jordan 20
Retro Air Jordan 21rotation
and overallRetro Air Jordan 22
Retro Air Jordan 23
Retro Air Jordan 2009
collection with something as iconic like the Fire Red III,
buy nike shoes online
buy online nike shoes
buying nike shoes online
cheap nike shoes online
so if you don’tNike Retro Jordan
11Nike Retro Jordan 12
Nike Retro Jordan 13 have a
pair yet (or need a second to stock), entire the Sneaker News Air Jordan III ‘Fire Red’ Giveaway – all you need is a
Facebook account and a few moments of your time.Nike Retro Jordan 14
Nike Retro Jordan 15
Nike Retro Jordan 16 We’ve
got a number of sizes available.
<p>Accordingly,fries nike bare easy lay ninety, it's each by the a lot cause Togolese Republic on an duo from fickle vapour Superfly cleats : whenever you happen to be fain to bear these richly drop by cash in nike air max 2010 since this stay. A few nodes contact which the skids broke inside of the to begin with thirty several hours. Moreover, or so occasionally checked nicks and too fools aft they exhausted this dwell as ere. Sol is broadly this low-cost Nike airflow goop ninety stable them</p>
The customers five fingers for salevibram five fingers salesour resumenew nike shoes service newest nike shoescause Hot Nike Shoes On Salethey are hot sale nike shoesthe most buy nike shoes onlinetrustworthy! This buying nike shoes onlinecorporation Vibram FiveFingers Classicperforms professional Nike Jordan 6resume service Nike Retro Jordan 9to fit the Nike Retro Jordan 9precise field of research you expect.
Do you ever know about the funny vibrams five fingers and what do the vibram five fingerslooks like?Do you realize the making principle and function of vibram five finger shoes?Now I am very happy to talk about vibram five fingers sales with all of you because I just know somewhat about five fingers vibram.The rubber sole of vibram fivefinger shoes are quite soft.You may feel strange when you wear vibram five fingers sale first time.But you will feel very comfortable after you wear vibram fivefingers several time.
This is a great post. you got cheap shoes online .I like cheap designer shoes as well give you designer shoes outlet
beats by dre
monster beats
dr dre beats
monster headphonehezhijunbeatsdres
<p>Door is too thin, yves saint laurent platform sandals the body of Mr Yip Kam pressure in the door felt earthquake in the earthquake, giuseppe zanotti balmain patent sandals the other hand was like a direct cheap giuseppe zanotti outlet knock on his heart in general. "I am in urgent how to do? You can not tyrants, ysl sandals outlet the toilet one night, right?" The other end of prolonged adjustment, continue to play a rogue style, ysl pumps and then continued to knock on the door. Mr Yip Kam roots of the ears were red, buy ysl shoes like mouth and say "shut up" was unable to pronounce the sounds, ysl pumps outlet realized that their throats out dumb. Secretly cleared his throat, ysl shoes tribute outlet so he decided not to sit still continues, bitterly aloud: "Wait a minute." And manolo blahnik rhinestone buckle sandals then gently let go and quickly ran manolo blahnik rhinestone buckle d'orsay towards the direction of his bedroom. However, giuseppe zanotti balmain men did not obey, let go of almost Mr Yip Kam To run the same time, ysl sandals Zhou Ya made straight into the door, and then...Was about to escape and grabbed the hand of Mr Yip Kam years manolo blahnik buckle d'orsay . Because too much force and Mr Yip Kam years and run too fast, ysl shoes direct to hear Mr Yip Kam Yan Zhou Ya soon Tongjiao years, pink ysl shoes then the other side of the body bounced into his arms. Zhou Ya Yan Shou Jin relaxed immediately, rhinestone manolo blahnik but did not release the arms, just to appease to be feeling the strain of the men about the arm.</p>
Do you have any Windows 7 Ultimate other similar blogs related fields of expression. This information Windows 7 Ultimate Key has caused in me some quasi-cascade effect Windows 7 Home Premium that has resulted in a great rearangement of my knowledge almost akin to a complete Windows 7 Professional paradigm shift in the way I perceive the world. Thank you so Office 2010 much for this and I bet you wil accumulate a ton of Karma and positive chi due to Microsoft Office 2010 your wonderful undertaking in this blog!
This is a great post. you got cheap shoes online .I like cheap designer shoes as well give you designer shoes outlet
I am absolutely amazed at how terrific the stuff is on this site. I have saved this webpage and I truly intend on visiting the site in the upcoming days. Keep up the excellent work!