Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* branch 'maint':
  Document git-repo-config --bool/--int options.
  tutorial: talk about user.name early and don't start with commit -a
  git-blame: fix rev parameter handling.
  • Loading branch information
Junio C Hamano committed Nov 29, 2006
2 parents df6b7bf + eb07fd5 commit aed4509
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 5 deletions.
6 changes: 6 additions & 0 deletions Documentation/git-repo-config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ OPTIONS
-l, --list::
List all variables set in config file.

--bool::
git-repo-config will ensure that the output is "true" or "false"

--int::
git-repo-config will ensure that the output is a simple decimal number


ENVIRONMENT
-----------
Expand Down
29 changes: 24 additions & 5 deletions Documentation/tutorial.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@ diff" with:
$ man git-diff
------------------------------------------------

It is a good idea to introduce yourself to git before doing any
operation. The easiest way to do so is:

------------------------------------------------
$ cat >~/.gitconfig <<\EOF
[user]
name = Your Name Comes Here
email = you@yourdomain.example.com
EOF
------------------------------------------------


Importing a new project
-----------------------

Expand All @@ -31,7 +43,8 @@ defaulting to local storage area

You've now initialized the working directory--you may notice a new
directory created, named ".git". Tell git that you want it to track
every file under the current directory with
every file under the current directory with (notice the dot '.'
that means the current directory):

------------------------------------------------
$ git add .
Expand All @@ -40,7 +53,7 @@ $ git add .
Finally,

------------------------------------------------
$ git commit -a
$ git commit
------------------------------------------------

will prompt you for a commit message, then record the current state
Expand All @@ -55,11 +68,17 @@ $ git diff
to review your changes. When you're done,

------------------------------------------------
$ git commit -a
$ git commit file1 file2...
------------------------------------------------

will again prompt your for a message describing the change, and then
record the new versions of the modified files.
record the new versions of the files you listed. It is cumbersome
to list all files and you can say `-a` (which stands for 'all')
instead.

------------------------------------------------
$ git commit -a
------------------------------------------------

A note on commit messages: Though not required, it's a good idea to
begin the commit message with a single short (less than 50 character)
Expand All @@ -75,7 +94,7 @@ $ git add path/to/new/file
------------------------------------------------

then commit as usual. No special command is required when removing a
file; just remove it, then commit.
file; just remove it, then tell `commit` about the file as usual.

At any point you can view the history of your changes using

Expand Down
1 change: 1 addition & 0 deletions builtin-blame.c
Original file line number Diff line number Diff line change
Expand Up @@ -1787,6 +1787,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
/* Now we got rev and path. We do not want the path pruning
* but we may want "bottom" processing.
*/
argv[unk++] = "--"; /* terminate the rev name */
argv[unk] = NULL;

init_revisions(&revs, NULL);
Expand Down

0 comments on commit aed4509

Please sign in to comment.