diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 14:34:00 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 14:34:00 -0700 |
commit | e6f28d0b6c239f15760194c8b12afdaa1a7bdd34 (patch) | |
tree | b782d1e78feb1a9f17131581d754b0e29abaa0b8 /config.txt | |
parent | 0e0e0d2656a57fd3628bb6dbdaf0096684ed24a9 (diff) | |
download | git-htmldocs-e6f28d0b6c239f15760194c8b12afdaa1a7bdd34.tar.gz |
Autogenerated HTML docs for v1.8.4-357-g8d83
Diffstat (limited to 'config.txt')
-rw-r--r-- | config.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config.txt b/config.txt index 0fa3f89c0..44e787352 100644 --- a/config.txt +++ b/config.txt @@ -170,8 +170,8 @@ advice.*:: pushNeedsForce:: Shown when linkgit:git-push[1] rejects an update that tries to overwrite a remote ref that points at an - object that is not a committish, or make the remote - ref point at an object that is not a committish. + object that is not a commit-ish, or make the remote + ref point at an object that is not a commit-ish. statusHints:: Show directions on how to proceed from the current state in the output of linkgit:git-status[1], in @@ -789,8 +789,8 @@ browser.<tool>.path:: working repository in gitweb (see linkgit:git-instaweb[1]). clean.requireForce:: - A boolean to make git-clean do nothing unless given -f - or -n. Defaults to true. + A boolean to make git-clean do nothing unless given -f, + -i or -n. Defaults to true. color.branch:: A boolean to enable/disable color in the output of |