undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.7.2' into maint

Browse Source 
* 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 "--"
This commit is contained in:
Junio C Hamano 2010-12-01 16:40:26 -08:00
commit 5501bf854c
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/config.txt
View File

@ -548,9 +548,13 @@ core.sparseCheckout::
linkgit:git-read-tree[1] for more information. linkgit:git-read-tree[1] for more information.
add.ignore-errors:: add.ignore-errors::
add.ignoreErrors::
Tells 'git add' to continue adding files when some files cannot be Tells 'git add' to continue adding files when some files cannot be
added due to indexing errors. Equivalent to the '--ignore-errors' 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.*:: alias.*::
Command aliases for the linkgit:git[1] command wrapper - e.g. Command aliases for the linkgit:git[1] command wrapper - e.g.

4
Documentation/git-commit.txt
View File

@ -11,8 +11,8 @@ SYNOPSIS
'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run] 'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
[(-c | -C) <commit>] [-F <file> | -m <msg>] [--reset-author] [(-c | -C) <commit>] [-F <file> | -m <msg>] [--reset-author]
[--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>] [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
[--date=<date>] [--cleanup=<mode>] [--status | --no-status] [--] [--date=<date>] [--cleanup=<mode>] [--status | --no-status]
[[-i | -o ]<file>...] [-i | -o] [--] [<file>...]
DESCRIPTION DESCRIPTION
----------- -----------

3
builtin/add.c
View File

@ -331,7 +331,8 @@ static struct option builtin_add_options[] = {
static int add_config(const char *var, const char *value, void *cb) 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); ignore_add_errors = git_config_bool(var, value);
return 0; return 0;
} }

2
contrib/completion/git-completion.bash
View File

@ -255,7 +255,7 @@ __git_ps1 ()
(describe) (describe)
git describe HEAD ;; git describe HEAD ;;
(* | default) (* | default)
git describe --exact-match HEAD ;; git describe --tags --exact-match HEAD ;;
esac 2>/dev/null)" || esac 2>/dev/null)" ||
b="$(cut -c1-7 "$g/HEAD" 2>/dev/null)..." || b="$(cut -c1-7 "$g/HEAD" 2>/dev/null)..." ||