Junio C Hamano 8b3da13610 Merge branch 'master' into next ...

* master:
  add: introduce add.ignoreerrors synonym for add.ignore-errors
  commit.c: Remove backward goto in read_craft_line()
  bash: Match lightweight tags in prompt
  git-commit.txt: (synopsis): move -i and -o before "--"

Conflicts:
	Documentation/git-commit.txt

2010-12-01 16:42:22 -08:00

..

add.c

Merge branch 'master' into next

2010-12-01 16:42:22 -08:00

annotate.c

…

apply.c

Merge branch 'fc/apply-p2-get-header-name'

2010-11-29 17:52:33 -08:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'kb/blame-author-email'

2010-11-29 17:52:32 -08:00

branch.c

branch: improve --verbose description

2010-11-15 10:05:44 -08:00

bundle.c

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

cat-file.c

blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''

2010-09-29 16:53:25 -07:00

check-attr.c

…

check-ref-format.c

Allow "check-ref-format --branch" from subdirectory

2010-08-06 10:01:45 -07:00

checkout-index.c

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

checkout.c

Merge branch 'rs/opt-help-text'

2010-11-24 15:55:19 -08:00

clean.c

Merge branch 'rs/opt-help-text'

2010-11-24 15:55:19 -08:00

clone.c

clone: Add the --recurse-submodules option as alias for --recursive

2010-11-05 10:28:01 -07:00

commit-tree.c

Sync with 1.7.3.2

2010-10-21 17:16:10 -07:00

commit.c

Merge branch 'pn/commit-autosquash' into next

2010-11-24 16:00:32 -08:00

config.c

Merge branch 'jn/paginate-fix'

2010-08-31 16:23:31 -07:00

count-objects.c

add description parameter to OPT__VERBOSE

2010-11-15 09:56:51 -08:00

describe.c

…

diff-files.c

Submodules: Use "ignore" settings from .gitmodules too for diff and status

2010-08-09 09:11:44 -07:00

diff-index.c

Submodules: Use "ignore" settings from .gitmodules too for diff and status

2010-08-09 09:11:44 -07:00

diff-tree.c

Submodules: Use "ignore" settings from .gitmodules too for diff and status

2010-08-09 09:11:44 -07:00

diff.c

diff,difftool: Don't use the {0,2} notation in usage strings

2010-11-05 10:05:31 -07:00

fast-export.c

Merge branch 'en/d-f-conflict-fix'

2010-09-08 08:54:01 -07:00

fetch-pack.c

…

fetch.c

Merge branch 'rs/opt-help-text'

2010-11-24 15:55:19 -08:00

fmt-merge-msg.c

Change incorrect "remote branch" to "remote tracking branch" in C code

2010-11-03 09:20:47 -07:00

for-each-ref.c

for-each-ref: fix objectname:short bug

2010-08-26 16:42:25 -07:00

fsck.c

add description parameter to OPT__VERBOSE

2010-11-15 09:56:51 -08:00

gc.c

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

grep.c

add description parameter to OPT__QUIET

2010-11-15 09:58:13 -08:00

hash-object.c

…

help.c

Cast execl*() NULL sentinels to (char *)

2010-07-25 23:14:18 -07:00

index-pack.c

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

init-db.c

init: plug tiny one-time memory leak

2010-10-06 10:46:05 -07:00

log.c

Merge branch 'pn/commit-autosquash' into next

2010-11-24 16:00:32 -08:00

ls-files.c

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

ls-remote.c

ls-remote: run setup_git_directory_gently() sooner

2010-08-15 20:00:02 -07:00

ls-tree.c

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

mailinfo.c

commit: helper methods to reduce redundant blocks of code

2010-11-04 13:53:34 -07:00

mailsplit.c

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

merge-base.c

merge-base --independent to print reduced parent list in a merge

2010-08-18 14:02:03 -07:00

merge-file.c

Merge branch 'rs/opt-help-text'

2010-11-24 15:55:19 -08:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

Merge branch 'jf/merge-ignore-ws'

2010-10-26 21:40:54 -07:00

merge-tree.c

merge-tree: fix where two branches share no changes

2010-07-14 12:56:49 -07:00

merge.c

Merge branch 'jh/notes-merge' into next

2010-11-24 16:00:33 -08:00

mktag.c

…

mktree.c

…

mv.c

add OPT__FORCE

2010-11-15 10:04:43 -08:00

name-rev.c

object.h: Add OBJECT_ARRAY_INIT macro and make use of it.

2010-08-29 22:42:49 -07:00

notes.c

Merge branch 'jh/notes-merge' into next

2010-11-24 16:00:33 -08:00

pack-objects.c

Merge branch 'jn/thinner-wrapper' into next

2010-11-24 16:00:34 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

add description parameter to OPT__DRY_RUN

2010-11-15 09:57:37 -08:00

push.c

Merge branch 'maint'

2010-08-12 18:07:09 -07:00

read-tree.c

add description parameter to OPT__VERBOSE

2010-11-15 09:56:51 -08:00

receive-pack.c

Merge branch 'tr/receive-pack-aliased-update-fix' into maint

2010-07-07 10:25:15 -07:00

reflog.c

…

remote-ext.c

remote-fd/ext: finishing touches after code review

2010-11-19 11:04:20 -08:00

remote-fd.c

remote-fd/ext: finishing touches after code review

2010-11-19 11:04:20 -08:00

remote.c

Merge branch 'rs/opt-help-text'

2010-11-24 15:55:19 -08:00

replace.c

…

rerere.c

Merge branch 'jn/merge-renormalize'

2010-09-03 09:43:41 -07:00

reset.c

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

rev-list.c

Merge branch 'jk/maint-rev-list-nul' into maint

2010-11-24 12:46:32 -08:00

rev-parse.c

Merge branch 'maint'

2010-07-07 11:18:26 -07:00

revert.c

Merge branch 'jn/cherry-pick-refresh-index'

2010-11-29 17:52:34 -08:00

rm.c

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

send-pack.c

Merge branch 'jk/push-progress'

2010-11-17 15:01:00 -08:00

shortlog.c

shortlog: run setup_git_directory_gently() sooner

2010-08-11 09:24:01 -07:00

show-branch.c

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

show-ref.c

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

stripspace.c

…

symbolic-ref.c

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

tag.c

Merge branch 'mg/maint-tag-rfc1991' into next

2010-11-24 16:00:35 -08:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

do not depend on signed integer overflow

2010-10-06 11:10:07 -07:00

update-index.c

Fix {update,checkout}-index usage strings

2010-10-08 12:31:08 -07:00

update-ref.c

…

update-server-info.c

add OPT__FORCE

2010-11-15 10:04:43 -08:00

upload-archive.c

…

var.c

var: run setup_git_directory_gently() sooner

2010-08-15 20:00:02 -07:00

verify-pack.c

…

verify-tag.c

Merge branch 'mg/maint-tag-rfc1991' into next

2010-11-24 16:00:35 -08:00

write-tree.c

…