From: Steffen Prohaska <prohaska@zib.de>
To: git@vger.kernel.org
Cc: Steffen Prohaska <prohaska@zib.de>
Subject: [PATCH] user-manual: mention git gui citool (commit, amend)
Date: Mon, 30 Jul 2007 18:11:20 +0200 [thread overview]
Message-ID: <11858118802945-git-send-email-prohaska@zib.de> (raw)
git gui is especially useful because it allows to select diff hunks.
Now it is at least mentioned in the user-manual.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
Documentation/user-manual.txt | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 0071cd0..de4ec0b 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1079,6 +1079,24 @@ $ git diff HEAD # difference between HEAD and working tree; what
$ git status # a brief per-file summary of the above.
-------------------------------------------------
+Another approach for creating commits is git gui:
+
+-------------------------------------------------
+$ git gui citool
+-------------------------------------------------
+
+starts the commit tool (Note, "`git gui`" starts the full gui, which
+provides more options).
+
+Beyond the basic operation of staging and unstaging complete files,
+git gui can also selectively stage diff hunks. You can do so by
+selecting a modified or staged file and right-click on the diff view
+in the lower part of the gui. A pop-up will appear that lets you
+select a specific hunk and stage or unstage it for the next commit.
+This is particular useful for slicing large, ugly commits into smaller
+pieces, for example when cherry-picking (see
+<<reordering-patch-series>>).
+
[[creating-good-commit-messages]]
Creating good commit messages
-----------------------------
@@ -2480,7 +2498,8 @@ $ 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.
+--amend. git gui may be especially useful to amend commits as it
+lets you selectively stage and unstage single diff hunks.
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.rc3.122.g4978
next reply other threads:[~2007-07-30 16:11 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-30 16:11 Steffen Prohaska [this message]
2007-07-31 0:24 ` [PATCH] user-manual: mention git gui citool (commit, amend) Shawn O. Pearce
2007-08-02 18:18 ` J. Bruce Fields
2007-08-02 22:24 ` Steffen Prohaska
2007-08-02 22:31 ` J. Bruce Fields
2007-08-03 5:08 ` Steffen Prohaska
2007-08-03 12:56 ` J. Bruce Fields
2007-08-05 12:59 ` [PATCH v2] " Steffen Prohaska
2007-08-05 13:58 ` Johannes Schindelin
2007-08-05 14:17 ` Steffen Prohaska
2007-08-05 14:48 ` Johannes Schindelin
2007-08-05 15:03 ` David Kastrup
2007-08-05 19:47 ` Steffen Prohaska
2007-08-06 0:22 ` Johannes Schindelin
2007-08-06 5:20 ` Steffen Prohaska
2007-08-06 9:36 ` Steven Grimm
2007-08-06 11:51 ` Johannes Schindelin
2007-08-05 22:22 ` J. Bruce Fields
2007-08-05 22:25 ` J. Bruce Fields
2007-08-06 0:26 ` Johannes Schindelin
2007-08-06 3:51 ` J. Bruce Fields
2007-08-06 19:36 ` Robin Rosenberg
2007-08-06 19:43 ` J. Bruce Fields
2007-08-03 3:01 ` [PATCH] " Shawn O. Pearce
2007-08-03 12:56 ` J. Bruce Fields
2007-08-04 6:33 ` Shawn O. Pearce
2007-08-05 12:09 ` Steffen Prohaska
2007-08-03 0:05 ` Junio C Hamano
2007-08-03 3:04 ` Shawn O. Pearce
2007-08-03 12:58 ` J. Bruce Fields
2007-08-04 6:20 ` Shawn O. Pearce
2007-08-04 7:44 ` David Kastrup
2007-08-04 14:35 ` J. Bruce Fields
2007-08-05 12:26 ` Steffen Prohaska
-- strict thread matches above, loose matches on Subject: below --
2007-08-06 3:33 Brett Schwarz
2007-08-06 4:06 ` Shawn O. Pearce
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=11858118802945-git-send-email-prohaska@zib.de \
--to=prohaska@zib.de \
--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).