diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-commit.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-reset.txt | 27 | ||||
| -rw-r--r-- | Documentation/glossary.txt | 11 | ||||
| -rw-r--r-- | Documentation/pull-fetch-param.txt | 6 |
4 files changed, 43 insertions, 5 deletions
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 <commit>:: Take existing commit object, and reuse the log message 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 <junkio@cox.net> and Linus Torvalds <torvalds@osdl.org> @@ -156,4 +182,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- Part of the gitlink:git[7] suite - diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index 2331be5a71..02a9d9c18a 100644 --- a/Documentation/glossary.txt +++ b/Documentation/glossary.txt @@ -111,6 +111,17 @@ branch:: a particular revision, which is called the branch head. The branch heads are stored in `$GIT_DIR/refs/heads/`. +master:: + The default branch. Whenever you create a git repository, a branch + named "master" is created, and becomes the active branch. In most + cases, this contains the local development. + +origin:: + The default upstream branch. Most projects have one upstream + project which they track, and by default 'origin' is used for + that purpose. New updates from upstream will be fetched into + this branch; you should never commit to it yourself. + ref:: A 40-byte hex representation of a SHA1 pointing to a particular object. These may be stored in `$GIT_DIR/refs/`. 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 <tag> to mean a - refspec `refs/tags/<tag>:refs/tags/<tag>`. +* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; + used with pull or fetch, it requests fetching everything up to + the given tag. * A parameter <ref> without a colon is equivalent to <ref>: when pulling/fetching, and <ref>`:`<ref> when pushing. That is, do not store it locally if |