Git development
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@citi.umich.edu>
To: gitster@pobox.com
Cc: git@vger.kernel.org,
	"J. Bruce Fields" <bfields@pig.linuxdev.us.dell.com>,
	"J. Bruce Fields" <bfields@citi.umich.edu>
Subject: [PATCH 3/5] user-manual: mention git-gui
Date: Mon,  6 Aug 2007 00:34:00 -0400	[thread overview]
Message-ID: <37994.1480620348$1186374889@news.gmane.org> (raw)
Message-ID: <407c0c87e15b3cf60347f4fc0bcdb4d239de4163.1186373089.git.bfields@pig.linuxdev.us.dell.com> (raw)
In-Reply-To: <11863748422754-git-send-email->
In-Reply-To: <0eb4f7cdf85273c88feb95c677a808cee9cfd859.1186373089.git.bfields@pig.linuxdev.us.dell.com>

From: J. Bruce Fields <bfields@pig.linuxdev.us.dell.com>

The git gui project seems to be still in early stages, but at a point
where it's worth mentioning as an alternative way of creating commits.

One feature of interest is the ability to manipulate individual diff
hunks.  However, people have found that feature not to be easily
discoverable from the user-interface.  Pending some ui improvements, a
parenthetical hint here may help.

(Thanks to Steffen Prohask and Junio Hamano for suggesting the
language.)

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---
 Documentation/user-manual.txt |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 9efe85c..f89952a 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1079,6 +1079,11 @@ $ git diff HEAD	    # difference between HEAD and working tree; what
 $ git status	    # a brief per-file summary of the above.
 -------------------------------------------------
 
+You can also use gitlink:git-gui[1] to create commits, view changes in
+the index and the working tree files, and individually select diff hunks
+for inclusion in the index (by right-clicking on the diff hunk and
+choosing "Stage Hunk For Commit").
+
 [[creating-good-commit-messages]]
 Creating good commit messages
 -----------------------------
@@ -2506,8 +2511,10 @@ $ gitk origin..mywork &
 
 And browse through the list of patches in the mywork branch using gitk,
 applying them (possibly in a different order) to mywork-new using
-cherry-pick, and possibly modifying them as you go using commit
---amend.
+cherry-pick, and possibly modifying them as you go using commit --amend.
+The git-gui[1] command may also help as it allows you to individually
+select diff hunks for inclusion in the index (by right-clicking on the
+diff hunk and choosing "Stage Hunk for Commit").
 
 Another technique is to use git-format-patch to create a series of
 patches, then reset the state to before the patches:
-- 
1.5.3.GIT

  parent reply	other threads:[~2007-08-06  4:34 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <11863748422001-git-send-email->
     [not found] ` <1186374842108-git-send-email->
     [not found]   ` <11863748422754-git-send-email->
     [not found]     ` <11863748423686-git-send-email->
     [not found] ` <0eb4f7cdf85273c88feb95c677a808cee9cfd859.1186373089.git.bfields@pig.linuxdev.us.dell.com>
2007-08-06  4:33   ` [PATCH 1/5] user-manual: update for new default --track behavior J. Bruce Fields
     [not found]   ` <7a7cc594ca294a58b6d7ae5aa50a65378538e875.1186373089.git.bfields@pig.linuxdev.us.dell.com>
2007-08-06  4:33     ` [PATCH 2/5] user-manual: mention git stash J. Bruce Fields
     [not found]   ` <407c0c87e15b3cf60347f4fc0bcdb4d239de4163.1186373089.git.bfields@pig.linuxdev.us.dell.com>
2007-08-06  4:34     ` J. Bruce Fields [this message]
     [not found]   ` <5f42ac921fe06bbb80df82d8fa5cb15701ec2f60.1186373089.git.bfields@pig.linuxdev.us.dell.com>
2007-08-06  4:34     ` [PATCH 4/5] documentation: use the word "index" in the git-add manual page J. Bruce Fields
     [not found]   ` <d30e77a3798bf9ccaec1efc5f2c7f01d47c35c5c.1186373089.git.bfields@pig.linuxdev.us.dell.com>
2007-08-06  4:34     ` [PATCH 5/5] documentation: use the word "index" in the git-commit man page J. Bruce Fields

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='37994.1480620348$1186374889@news.gmane.org' \
    --to=bfields@citi.umich.edu \
    --cc=bfields@pig.linuxdev.us.dell.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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