git/Documentation/technical, branch v1.6.3

Merge branch 'maint'

2009-04-28T07:46:39Z

* maint: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message

Merge branch 'maint-1.6.1' into maint

2009-04-28T07:46:25Z

* maint-1.6.1: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message

Merge branch 'maint-1.6.0' into maint-1.6.1

2009-04-28T07:46:20Z

* maint-1.6.0: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message

Documentation: fix a grammatical error in api-builtin.txt

2009-04-27T16:36:40Z

Signed-off-by: Allan Caffee Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-03-30T20:29:57Z

* maint: Update draft release notes to 1.6.2.2 Fix bash completion in path with spaces bash completion: only show 'log --merge' if merging git-tag(1): add hint about commit messages Documentation: update graph api example.

Merge branch 'maint-1.6.1' into maint

2009-03-30T20:25:27Z

* maint-1.6.1: Fix bash completion in path with spaces bash completion: only show 'log --merge' if merging git-tag(1): add hint about commit messages Documentation: update graph api example. Conflicts: contrib/completion/git-completion.bash

Merge branch 'maint-1.6.0' into maint-1.6.1

2009-03-30T20:23:53Z

* maint-1.6.0: Fix bash completion in path with spaces bash completion: only show 'log --merge' if merging git-tag(1): add hint about commit messages Documentation: update graph api example.

Documentation: update graph api example.

2009-03-30T15:59:45Z

As of commit 03300c0 the graph API uses '*' for all nodes including merges. This updates the example in the documentation to match. Signed-off-by: Allan Caffee Signed-off-by: Junio C Hamano

parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used together

2009-03-09T22:32:50Z

As suggested by Junio, disallow the flags PARSE_OPT_KEEP_UNKNOWN and PARSE_OPT_STOP_AT_NON_OPTION to be turned on at the same time, as a value of an unknown option could be mistakenly classified as a non-option, stopping the parser early. E.g.: git cmd --known --unknown value arg0 arg1 The parser should have stopped at "arg0", but it already stops at "value". This patch makes parse_options() die if the two flags are used in combination. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

parseopt: document KEEP_ARGV0, KEEP_UNKNOWN, NO_INTERNAL_HELP

2009-03-09T22:24:16Z

Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano