From c2bc6e404d75a3a68da5eefa47fa867569bc3339 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Thu, 12 Jan 2006 22:08:37 -0500 Subject: Documentation: clarify fetch parameter descriptions. Signed-off-by: Junio C Hamano --- Documentation/pull-fetch-param.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Documentation') diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index b5b979242c..4524fee6f2 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -134,9 +134,9 @@ is often useful. + Some short-cut notations are also supported. + -* For backward compatibility, `tag` is almost ignored; - it just makes the following parameter to mean a - refspec `refs/tags/:refs/tags/`. +* `tag ` means the same as `refs/tags/:refs/tags/`; + used with pull or fetch, it requests fetching everything up to + the given tag. * A parameter without a colon is equivalent to : when pulling/fetching, and `:` when pushing. That is, do not store it locally if -- cgit v1.3 From cb95bf488b4363b51bd0aebc877a928858e51545 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 13 Jan 2006 12:59:21 -0800 Subject: Documentation: git-commit -a A bit more elaboration on what "update all paths" means. Signed-off-by: Junio C Hamano --- Documentation/git-commit.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index e0ff74f648..e35984dfc7 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -25,7 +25,9 @@ information. OPTIONS ------- -a|--all:: - Update all paths in the index file. + Update all paths in the index file. This flag notices + files that have been modified and deleted, but new files + you have not told about git are not affected. -c or -C :: Take existing commit object, and reuse the log message -- cgit v1.3 From a0dfb48af73a98ceb60629f2bbc4ebf1393ba0af Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 13 Jan 2006 13:17:55 -0800 Subject: Documentation: git-reset - interrupted workflow. Signed-off-by: Junio C Hamano --- Documentation/git-reset.txt | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index c6a269b7ef..315683a6d5 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -145,6 +145,32 @@ brings your index file and the working tree back to that state, and resets the tip of the branch to that commit. ------------ +Interrupted workflow:: ++ +You can get interrupted by an ungent fix request while you are +still in the middle of a large change. The files in your +working tree are not in any shape to be committed yet, but you +need to get to the other branch for a quick bugfix. ++ +------------ +$ git checkout feature ;# you were working in "feature" branch and +$ work work work ;# got interrupted +$ git commit -a -m 'snapshot WIP' <1> +$ git checkout master +$ fix fix fix +$ git commit ;# commit with real log +$ git checkout feature +$ git reset --soft HEAD^ ;# go back to WIP state <2> +$ git reset <3> + +<1> This commit will get blown away so a throw-away log message is OK. +<2> This removes the 'WIP' commit from the commit history, and makes + your working tree in the state just before you made that snapshot. +<3> After <2>, the index file still has all the WIP changes you + committed in <1>. This sets it to the last commit you were + basing the WIP changes on. +------------ + Author ------ Written by Junio C Hamano and Linus Torvalds @@ -156,4 +182,3 @@ Documentation by Junio C Hamano and the git-list . GIT --- Part of the gitlink:git[7] suite - -- cgit v1.3