{"thread":{"id":"33564","subject":"Staging Individual Lines","startedAt":"2013-04-21T22:22:49Z","lastAt":"2013-04-22T14:35:02Z","messageCount":3,"participants":["ode","Felipe Contreras","Joshua Jensen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"215047","messageId":"517466B9.8010607@blueyonder.co.uk","threadId":"33564","inReplyTo":null,"subject":"Staging Individual Lines","fromName":"ode","fromEmail":"ode5002@blueyonder.co.uk","sentAt":"2013-04-21T22:22:49Z","receivedAt":"2013-04-21T22:22:49Z","isPatch":false,"sender":{"key":"ode5002@blueyonder.co.uk","avatar":null},"body":"Hi,\n\nI had a big commit I wanted to break up and was wondering if there is\nany way to stage individual lines from the command line.\n\nI am using git add -i but it couldn't split the hunks any smaller.\n\nI went looking on Google and found git-cola gui client which works for\nstaging individual lines to the commit.\n\nBut it's a bit clumsy to do this with the mouse and I was wondering if\nthere is a way to do this without having manually editing the file and\nchanging the diff numbers in git add -i when it can't break the hunks\nsmaller.\n\nWhy must we still manually edit the diff numbers when git-cola seems to\nbe able to work out the changes automatically when adding single lines?\n\nThanks for your help.\n"},{"id":"215048","messageId":"CAMP44s0Mj+inGX24=-RuV+oT5MZB==HZZvu6_5uZrP68qdPoZw@mail.gmail.com","threadId":"33564","inReplyTo":"517466B9.8010607@blueyonder.co.uk","subject":"Re: Staging Individual Lines","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-04-21T23:52:52Z","receivedAt":"2013-04-21T23:52:52Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Sun, Apr 21, 2013 at 5:22 PM, ode <ode5002@blueyonder.co.uk> wrote:\n> Hi,\n>\n> I had a big commit I wanted to break up and was wondering if there is\n> any way to stage individual lines from the command line.\n>\n> I am using git add -i but it couldn't split the hunks any smaller.\n>\n> I went looking on Google and found git-cola gui client which works for\n> staging individual lines to the commit.\n>\n> But it's a bit clumsy to do this with the mouse and I was wondering if\n> there is a way to do this without having manually editing the file and\n> changing the diff numbers in git add -i when it can't break the hunks\n> smaller.\n>\n> Why must we still manually edit the diff numbers when git-cola seems to\n> be able to work out the changes automatically when adding single lines?\n\nThere is an 'edit' option. 'git add -p' might be faster.\n\nCheers.\n\n-- \nFelipe Contreras\n"},{"id":"215081","messageId":"51754A96.8050508@workspacewhiz.com","threadId":"33564","inReplyTo":"517466B9.8010607@blueyonder.co.uk","subject":"Re: Staging Individual Lines","fromName":"Joshua Jensen","fromEmail":"jjensen@workspacewhiz.com","sentAt":"2013-04-22T14:35:02Z","receivedAt":"2013-04-22T14:35:02Z","isPatch":false,"sender":{"key":"jjensen@workspacewhiz.com","avatar":"https://avatars.githubusercontent.com/u/111687?v=4"},"body":"----- Original Message -----\nFrom: ode\nDate: 4/21/2013 4:22 PM\n> I went looking on Google and found git-cola gui client which works for\n> staging individual lines to the commit.\nThe 'git gui' that ships with Git also stages individual lines and \ngroups of lines, FWIW.\n\n-Josh\n"}]}