git/Documentation/technical, branch v1.6.4

technical/api-remote: Describe new struct remote member pushurl

2009-06-10T06:46:47Z

...and pushurl_nr Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

parse-opts: add OPT_FILENAME and transition builtins

2009-05-25T08:07:33Z

Commit dbd0f5c (Files given on the command line are relative to $cwd, 2008-08-06) introduced parse_options_fix_filename() as a minimal fix. OPT_FILENAME is intended to be a more robust fix for the same issue. OPT_FILENAME and its associated enum OPTION_FILENAME are used to represent filename options within the parse options API. This option is similar to OPTION_STRING. If --no is prefixed to the option the filename is unset. If no argument is given and the default value is set, the filename is set to the default value. The difference is that the filename is prefixed with the prefix passed to parse_options() (or parse_options_start()). Update git-apply, git-commit, git-fmt-merge-msg, and git-tag to use OPT_FILENAME with their filename options. Also, rename parse_options_fix_filename() to fix_filename() as it is no longer extern. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

parse-opts: prepare for OPT_FILENAME

2009-05-25T08:07:25Z

To give OPT_FILENAME the prefix, we pass the prefix to parse_options() which passes the prefix to parse_options_start() which sets the prefix member of parse_opts_ctx accordingly. If there isn't a prefix in the calling context, passing NULL will suffice. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

Merge branch 'rs/grep-parseopt'

2009-05-23T08:38:32Z

* rs/grep-parseopt: grep: make callback functions static grep: use parseopt grep: remove global variable builtin_grep parseopt: add PARSE_OPT_NODASH parseopt: add OPT_NUMBER_CALLBACK parseopt: add OPT_NEGBIT

api-parse-options.txt: use 'func' instead of 'funct'

2009-05-16T18:47:10Z

Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

parseopt: add OPT_NUMBER_CALLBACK

2009-05-09T07:29:47Z

Add a way to recognize numerical options. The number is passed to a callback function as a string. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

parseopt: add OPT_NEGBIT

2009-05-09T07:28:53Z

Add OPTION_NEGBIT and OPT_NEGBIT, mirroring OPTION_BIT and OPT_BIT. OPT_NEGBIT can be used together with OPT_BIT to define two options that cancel each other out. Note: this patch removes the reminder from the test script because it adds a test for --no-or4 and there already was one for --or4. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

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