author | Junio C Hamano <gitster@pobox.com> | |
Thu, 2 Dec 2010 00:41:13 +0000 (16:41 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 2 Dec 2010 00:41:13 +0000 (16:41 -0800) |
* maint:
add: introduce add.ignoreerrors synonym for add.ignore-errors
bash: Match lightweight tags in prompt
git-commit.txt: (synopsis): move -i and -o before "--"
add: introduce add.ignoreerrors synonym for add.ignore-errors
bash: Match lightweight tags in prompt
git-commit.txt: (synopsis): move -i and -o before "--"
Documentation/config.txt | patch | blob | history | |
Documentation/git-commit.txt | patch | blob | history | |
builtin/add.c | patch | blob | history | |
contrib/completion/git-completion.bash | patch | blob | history |
index 6a6c0b5bd83774c9c92f5530f327019c322d3c2a..6b7279f88303e2d7a45baa27022cb9e53cf387be 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
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.
index 42fb1f57b21d7c355d3df6be07329c478786a9a7..ec7b577b85ae5a320b1006380f5abd03946ba44b 100644 (file)
'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 71f9b04fef829ad3725ca50902bd6935dc3cda36..21dc1f73395b5f6b1491c235f656bea057092eb1 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
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;
}
index f71046947febee2cacfd2a9ed2e0746582a5e54f..604fa794cc4d2dd657f054f42e3001bee13b8202 100755 (executable)
(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)..." ||