Junio C Hamano 6758af89e4 Merge branch 'jn/git-cmd-h-bypass-setup' ...

* jn/git-cmd-h-bypass-setup:
  update-index -h: show usage even with corrupt index
  merge -h: show usage even with corrupt index
  ls-files -h: show usage even with corrupt index
  gc -h: show usage even with broken configuration
  commit/status -h: show usage even with broken configuration
  checkout-index -h: show usage even in an invalid repository
  branch -h: show usage even in an invalid repository

Conflicts:
	builtin/merge.c

2010-12-12 21:49:50 -08:00

..

add.c

Merge branch 'nd/maint-fix-add-typo-detection' (early part)

2010-12-08 11:25:52 -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

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -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 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

config.c

…

count-objects.c

add description parameter to OPT__VERBOSE

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

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

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

…

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

…

fsck.c

add description parameter to OPT__VERBOSE

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

gc.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

grep.c

thread-utils.h: simplify the inclusion

2010-12-10 12:58:06 -08:00

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

…

log.c

Merge branch 'pn/commit-autosquash'

2010-12-03 16:13:06 -08:00

ls-files.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

ls-remote.c

…

ls-tree.c

…

mailinfo.c

commit: helper methods to reduce redundant blocks of code

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

mailsplit.c

…

merge-base.c

…

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.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

mktag.c

…

mktree.c

…

mv.c

add OPT__FORCE

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

name-rev.c

…

notes.c

Merge branch 'jh/notes-merge'

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

pack-objects.c

thread-utils.h: simplify the inclusion

2010-12-10 12:58:06 -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

…

read-tree.c

add description parameter to OPT__VERBOSE

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

receive-pack.c

…

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

…

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

…

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

…

show-branch.c

…

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'

2010-12-08 11:24:13 -08:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

update-ref.c

…

update-server-info.c

add OPT__FORCE

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

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

Merge branch 'mg/maint-tag-rfc1991'

2010-12-08 11:24:13 -08:00

write-tree.c

…