diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-19 21:15:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-19 21:15:51 (GMT) |
| commit | c7deb8dac1f24498a353327ec9fceb99695582c2 (patch) | |
| tree | 58c819d4a87c8e4fed16fdc615ce8579a4230536 /Documentation/config.txt | |
| parent | 38a18873b21f6f2eebedc65aff2249fd6ec2168c (diff) | |
| parent | 5b57413cb3952654031115f6f840e3dcb120914e (diff) | |
| download | git-c7deb8dac1f24498a353327ec9fceb99695582c2.zip git-c7deb8dac1f24498a353327ec9fceb99695582c2.tar.gz git-c7deb8dac1f24498a353327ec9fceb99695582c2.tar.bz2 | |
Merge branch 'maint'
* maint:
t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
Clarify and extend the "git diff" format documentation
git-show-ref.txt: clarify the pattern matching
documentation: git-config minor cleanups
Update test script annotate-tests.sh to handle missing/extra authors
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 71ddb6c..ba9639c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1560,12 +1560,12 @@ push.default:: no refspec is implied by any of the options given on the command line. Possible values are: + -* `nothing` do not push anything. -* `matching` push all matching branches. +* `nothing` - do not push anything. +* `matching` - push all matching branches. All branches having the same name in both ends are considered to be matching. This is the default. -* `tracking` push the current branch to its upstream branch. -* `current` push the current branch to a branch of the same name. +* `tracking` - push the current branch to its upstream branch. +* `current` - push the current branch to a branch of the same name. rebase.stat:: Whether to show a diffstat of what changed upstream since the last @@ -1765,9 +1765,9 @@ status.showUntrackedFiles:: the untracked files. Possible values are: + -- - - 'no' - Show no untracked files - - 'normal' - Shows untracked files and directories - - 'all' - Shows also individual files in untracked directories. +* `no` - Show no untracked files. +* `normal` - Show untracked files and directories. +* `all` - Show also individual files in untracked directories. -- + If this variable is not specified, it defaults to 'normal'. |