@matheusbsbs / matheus-bagliano / commits / 407c0c87e1
Fork 0

user-manual: mention git-gui

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>

J. Bruce Fields committed Aug 5, 2007 at 18:12 UTC 407c0c87e15b3cf60347f4fc0bcdb4d239de4163
1 file changed +9 -2
Documentation/user-manual.txt
+9 -2
@@ -1079,6 +1079,11 @@ $ git diff HEAD # difference between HEAD and working tree; what
1079 $ git status # a brief per-file summary of the above.
1080 -------------------------------------------------
1081
1082 +You can also use gitlink:git-gui[1] to create commits, view changes in
1083 +the index and the working tree files, and individually select diff hunks
1084 +for inclusion in the index (by right-clicking on the diff hunk and
1085 +choosing "Stage Hunk For Commit").
1086 +
1087 [[creating-good-commit-messages]]
1088 Creating good commit messages
1089 -----------------------------
@@ -2506,8 +2511,10 @@ $ gitk origin..mywork &
2511
2512 And browse through the list of patches in the mywork branch using gitk,
2513 applying them (possibly in a different order) to mywork-new using
2509 -cherry-pick, and possibly modifying them as you go using commit
2510 ---amend.
2514 +cherry-pick, and possibly modifying them as you go using commit --amend.
2515 +The git-gui[1] command may also help as it allows you to individually
2516 +select diff hunks for inclusion in the index (by right-clicking on the
2517 +diff hunk and choosing "Stage Hunk for Commit").
2518
2519 Another technique is to use git-format-patch to create a series of
2520 patches, then reset the state to before the patches: