aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-01 16:40:26 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-01 16:40:26 -0800
commit5501bf854ce6a3847ef0de6f6aa63f6b93e82b67 (patch)
tree207af060fbb0f8ce50f93cd1cc8c73d049729ce1
parent16529f2e5630d3d155e4dff0ebd3c7c5daa882f9 (diff)
parent2de132f8844f3b1b3c9f898e48829630d0cabb07 (diff)
downloadgit-5501bf854ce6a3847ef0de6f6aa63f6b93e82b67.tar.gz
git-5501bf854ce6a3847ef0de6f6aa63f6b93e82b67.tar.xz
Merge branch 'maint-1.7.2' into maint
* maint-1.7.2: add: introduce add.ignoreerrors synonym for add.ignore-errors bash: Match lightweight tags in prompt git-commit.txt: (synopsis): move -i and -o before "--"
-rw-r--r--Documentation/config.txt6
-rw-r--r--Documentation/git-commit.txt4
-rw-r--r--builtin/add.c3
-rwxr-xr-xcontrib/completion/git-completion.bash2
4 files changed, 10 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e6a8f27f2..3fd4b626f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -548,9 +548,13 @@ core.sparseCheckout::
linkgit:git-read-tree[1] for more information.
add.ignore-errors::
+add.ignoreErrors::
Tells 'git add' to continue adding files when some files cannot be
added due to indexing errors. Equivalent to the '--ignore-errors'
- option of linkgit:git-add[1].
+ option of linkgit:git-add[1]. Older versions of git accept only
+ `add.ignore-errors`, which does not follow the usual naming
+ convention for configuration variables. Newer versions of git
+ honor `add.ignoreErrors` as well.
alias.*::
Command aliases for the linkgit:git[1] command wrapper - e.g.
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 42fb1f57b..ec7b577b8 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -11,8 +11,8 @@ SYNOPSIS
'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
[(-c | -C) <commit>] [-F <file> | -m <msg>] [--reset-author]
[--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
- [--date=<date>] [--cleanup=<mode>] [--status | --no-status] [--]
- [[-i | -o ]<file>...]
+ [--date=<date>] [--cleanup=<mode>] [--status | --no-status]
+ [-i | -o] [--] [<file>...]
DESCRIPTION
-----------
diff --git a/builtin/add.c b/builtin/add.c
index 56a4e0af6..3a5fca515 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -331,7 +331,8 @@ static struct option builtin_add_options[] = {
static int add_config(const char *var, const char *value, void *cb)
{
- if (!strcasecmp(var, "add.ignore-errors")) {
+ if (!strcasecmp(var, "add.ignoreerrors") ||
+ !strcasecmp(var, "add.ignore-errors")) {
ignore_add_errors = git_config_bool(var, value);
return 0;
}
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index f83f019ca..d3037fc94 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -255,7 +255,7 @@ __git_ps1 ()
(describe)
git describe HEAD ;;
(* | default)
- git describe --exact-match HEAD ;;
+ git describe --tags --exact-match HEAD ;;
esac 2>/dev/null)" ||
b="$(cut -c1-7 "$g/HEAD" 2>/dev/null)..." ||