Junio C Hamano 6201eb3e65 Merge branch 'ap/maint-update-index-h-is-for-help' into maint ...

"git update-index -h" did not do the usual "-h(elp)" thing.

* ap/maint-update-index-h-is-for-help:
  update-index: allow "-h" to also display options

2013-03-26 12:42:42 -07:00

..

add.c

add: update pathless 'add [-u|-A]' warning to reflect change of plan

2013-03-11 07:57:35 -07:00

annotate.c

…

apply.c

Merge branch 'jk/apply-similaritly-parsing' into maint

2013-02-25 08:03:44 -08:00

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

Merge branch 'nd/branch-error-cases'

2013-02-07 14:41:38 -08:00

bundle.c

…

cat-file.c

drop some obsolete "x = x" compiler warning hacks

2013-03-21 14:06:38 -07:00

check-attr.c

…

check-ignore.c

name-hash: allow hashing an empty string

2013-02-19 14:00:12 -08:00

check-ref-format.c

…

checkout-index.c

…

checkout.c

…

clean.c

…

clone.c

Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maint

2013-02-25 08:03:27 -08:00

column.c

…

commit-tree.c

…

commit.c

Merge branch 'maint'

2013-02-12 12:23:12 -08:00

config.c

…

count-objects.c

…

credential.c

…

describe.c

Fix ".git/refs" stragglers

2013-02-24 22:23:32 -08:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

fast-export.c

…

fetch-pack.c

…

fetch.c

…

fmt-merge-msg.c

Merge branch 'jc/custom-comment-char'

2013-02-04 10:23:49 -08:00

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

…

hash-object.c

…

help.c

Merge branch 'jk/config-parsing-cleanup'

2013-02-04 10:24:50 -08:00

index-pack.c

index-pack: fix buffer overflow caused by translations

2013-03-16 22:08:53 -07:00

init-db.c

…

log.c

…

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'jc/custom-comment-char'

2013-02-04 10:23:49 -08:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

…

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

push.c

Merge branch 'jc/push-reject-reasons'

2013-02-04 10:25:04 -08:00

read-tree.c

…

receive-pack.c

Merge branch 'jc/hidden-refs'

2013-02-17 15:25:57 -08:00

reflog.c

Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maint

2013-03-26 12:39:51 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

…

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

…

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

…

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

update-index: allow "-h" to also display options

2013-02-23 23:49:33 -08:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…