Yes, in Git you can "stage" individual lines, commit only those and you'll have the rest of your changes uncommitted in your workspace.
Like Judah said, you should be working on your new feature or release or whatever in its own branch and committing often - even if it's not complete or working, since you're committing locally anyway, it's not affecting anyone else. (Here's a nice branching model we've adopted: http://nvie.com/posts/a-successful-git-branching-model/) So, to make a quick change, commit your work in progress, checkout the hotfix branch, make the change, commit it, push that branch to release/production, then re-check out the feature branch you were working on. Git makes this all really easy and you want to do it this way since a big part of using version control is to have clear tracking of what changes mean what. .jonah On 7/27/11 10:22 AM, Larry Lyons wrote: > If I remember correctly, you can also cherry pick your final commits in git. > So effectively that's a line by line commit. > >> With Git and Mercurial, you can "shelve" changes. So if you are part >> way through a big change and something important comes in, you can >> tell the source control system to stash the current changes out of >> the >> way, go back to your version prior to the current changes, make the >> new important changes and commit them, then pull the uncommitted >> stuff >> you were working on back into your working branch and go on your >> merry >> way. >> >> Judah >> >> On Wed, Jul 27, 2011 at 9:28 AM, Shannon Rhodes<Shannon@rhodesedge. >> com> wrote: >>> Yeah, what Dave said...I'm talking about committing part of a file, >> not part of a project. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Order the Adobe Coldfusion Anthology now! http://www.amazon.com/Adobe-Coldfusion-Anthology/dp/1430272155/?tag=houseoffusion Archive: http://www.houseoffusion.com/groups/cf-talk/message.cfm/messageid:346373 Subscription: http://www.houseoffusion.com/groups/cf-talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/groups/cf-talk/unsubscribe.cfm
