From: Graeme Geldenhuys <graemeg.lists@gmail.com>
To: git@vger.kernel.org
Subject: staging specific lines out of a hunk for a commit
Date: Tue, 21 Sep 2010 12:40:35 +0200 [thread overview]
Message-ID: <AANLkTin4U78N_8LV8fCWuinNH9AFeOsRBjnvHM0qt2ZH@mail.gmail.com> (raw)
Hi,
I know 'git gui' has this cool feature where you can stage one line at
a time. This is really handy, but also very annoying, if you have a
large piece of code you want to commit.
eg: I have a single hunk, which can't be split into smaller hunks
because it is all new code. But that hunk fixes a few bugs, or
introduces a few new features.
Is there a way to use 'git add -i' or 'git add -p' or 'git gui' and
tell it to add for example lines 5-20 of the hunk to the index?
Currently with 'git gui', I have to right click and select 'Stage line
for commit' 15+ times! :-(
Maybe 'gui gui' can be enhance (don't know if development work is
continuing on gui gui') to use the same feature as in the "unstaged
changes" area of the UI. There you can simply click the icon next to
the file name to add that file. Maybe the same could be implemented to
the "diff" area of the UI. Simply click the first column in the diff
area (where the '+' or '-' or ' ' appears), to add those lines to the
index. This will make adding or removing line to/from a commit so much
quicker and easier than the popup menu.
I'm using git-gui 0.12.0.64 and git version 1.7.0.4.
--
Regards,
- Graeme -
_______________________________________________
fpGUI - a cross-platform Free Pascal GUI toolkit
http://opensoft.homeip.net:8080/fpgui/
next reply other threads:[~2010-09-21 10:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-21 10:40 Graeme Geldenhuys [this message]
2010-09-21 10:52 ` staging specific lines out of a hunk for a commit Bert Wesarg
2010-09-21 11:00 ` Graeme Geldenhuys
2010-09-21 11:31 ` Matthieu Moy
2010-09-21 11:44 ` Graeme Geldenhuys
2010-09-21 11:09 ` Jonathan del Strother
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTin4U78N_8LV8fCWuinNH9AFeOsRBjnvHM0qt2ZH@mail.gmail.com \
--to=graemeg.lists@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).