[PATCH v2] user-manual: mention git gui citool (commit, amend)
From: Steffen Prohaska <hidden>
Date: 2016-06-15 22:43:27
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
git gui is especially useful because it allows to select diff hunks. Now it is briefly mentioned in the user-manual. Signed-off-by: Steffen Prohaska <redacted> --- Documentation/user-manual.txt | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 0071cd0..6865d21 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt@@ -1079,6 +1079,17 @@ $ 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, which lets you add files (use menu +'Commit > Stage to Commit') or individually diff hunks (use +'Stage Hunk For Commit' in the context menu of the diff view) +to the index. + [[creating-good-commit-messages]] Creating good commit messages -----------------------------
@@ -2482,6 +2493,10 @@ applying them (possibly in a different order) to mywork-new using cherry-pick, and possibly modifying them as you go using commit --amend. +git gui is especially useful to rework commits as it lets you +selectively add single diff hunks to the index (use +'Stage Hunk For Commit' in the context menu of the diff view). + 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.151.g8d6306