On Mon, Aug 06, 2007 at 01:26:21AM +0100, Johannes Schindelin wrote: > On Sun, 5 Aug 2007, J. Bruce Fields wrote: > > A big warning would be out of place in what is for now just an isolated > > sentence in two different places. But I agree with you that this would > > be worth mentioning in any eventual full-fledged git-gui tutorial. > > Unfortunately, I am really wasted by this weekend's efforts to bring > msysgit.git along... could you be so kind as to cut&paste the relevant > section in a reply to me, so I do not have to search for myself? Sure; appended. This isn't that different from Steffen's proposal. > I would not normally ask for such a favour; it is relatively easy to go on > a search with Git, but I do have only 8 hours of sleep in the last 60 > hours under my saddle... Hm. On the other hand, maybe we should just be refusing to feed your addiction till you get some sleep. I wanna keep this short for now, so if we really think we shouldn't mention of the hunk-selection thing without a warning, I'd rather just omit mention of it, and go for something like: "You can also use gitlink:git-gui[1] to create commits and view changes in the index and working tree", and drop the second hunk. Whatever. --b. >From 407c0c87e15b3cf60347f4fc0bcdb4d239de4163 Mon Sep 17 00:00:00 2001 From: J. Bruce Fields <bfields@xxxxxxxxxxxxxxxxxxxxxxxx> Date: Sun, 5 Aug 2007 18:12:37 -0400 Subject: [PATCH] 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@xxxxxxxxxxxxxx> --- 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
