Junio C Hamano d8df70f273 Merge branch 'jm/status-ignored-files-list' ...

The set of paths output from "git status --ignored" was tied
closely with its "--untracked=<mode>" option, but now it can be
controlled more flexibly.  Most notably, a directory that is
ignored because it is listed to be ignored in the ignore/exclude
mechanism can be handled differently from a directory that ends up
to be ignored only because all files in it are ignored.

* jm/status-ignored-files-list:
  status: test ignored modes
  status: document options to show matching ignored files
  status: report matching ignored and normal untracked
  status: add option to show ignored files differently

2017-11-13 14:44:59 +09:00

..

add.c

diff: make struct diff_flags members lowercase

2017-11-01 11:51:40 +09:00

am.c

Merge branch 'bw/diff-opt-impl-to-bitfields'

2017-11-09 14:31:27 +09:00

annotate.c

…

apply.c

apply: move lockfile into apply_state

2017-10-06 10:07:18 +09:00

archive.c

…

bisect--helper.c

bisect--helper: is_expected_rev & check_expected_revs shell function in C

2017-10-06 14:12:37 +09:00

blame.c

diff: make struct diff_flags members lowercase

2017-11-01 11:51:40 +09:00

branch.c

Merge branch 'bc/object-id'

2017-11-06 14:24:27 +09:00

bundle.c

…

cat-file.c

Merge branch 'jk/diff-blob' into maint

2017-10-18 14:19:01 +09:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

Merge branch 'jc/check-ref-format-oor'

2017-11-06 14:24:28 +09:00

checkout-index.c

checkout-index: simplify locking logic

2017-10-06 10:07:18 +09:00

checkout.c

Merge branch 'bc/object-id'

2017-11-06 14:24:27 +09:00

clean.c

Merge branch 'jk/ref-filter-colors-fix'

2017-10-18 10:19:08 +09:00

clone.c

Merge branch 'bc/object-id'

2017-11-06 14:24:27 +09:00

column.c

…

commit-tree.c

…

commit.c

Merge branch 'jm/status-ignored-files-list'

2017-11-13 14:44:59 +09:00

config.c

…

count-objects.c

…

credential.c

…

describe.c

Merge branch 'bc/object-id'

2017-11-06 14:24:27 +09:00

diff-files.c

…

diff-index.c

Merge branch 'ma/builtin-unleak'

2017-10-07 16:27:55 +09:00

diff-tree.c

…

diff.c

Merge branch 'bw/diff-opt-impl-to-bitfields'

2017-11-09 14:31:27 +09:00

difftool.c

read-cache: leave lock in right state in write_locked_index()

2017-10-07 10:20:56 +09:00

fast-export.c

Merge branch 'bw/diff-opt-impl-to-bitfields'

2017-11-09 14:31:27 +09:00

fetch-pack.c

…

fetch.c

Convert check_connected to use struct object_id

2017-10-16 11:05:50 +09:00

fmt-merge-msg.c

refs: convert resolve_refdup and refs_resolve_refdup to struct object_id

2017-10-16 11:05:50 +09:00

for-each-ref.c

provide --color option for all ref-filter users

2017-10-04 11:35:29 +09:00

fsck.c

refs: convert resolve_ref_unsafe to struct object_id

2017-10-16 11:05:51 +09:00

gc.c

Merge branch 'aw/gc-lockfile-fscanf-fix' into maint

2017-10-18 14:18:59 +09:00

get-tar-commit-id.c

distinguish error versus short read from read_in_full()

2017-09-27 15:45:24 +09:00

grep.c

Merge branch 'bw/grep-recurse-submodules'

2017-11-06 13:11:27 +09:00

hash-object.c

…

help.c

Merge branch 'ks/help-alias-label'

2017-09-25 15:24:07 +09:00

index-pack.c

cleanup: fix possible overflow errors in binary search

2017-10-10 08:57:24 +09:00

init-db.c

…

interpret-trailers.c

…

log.c

Merge branch 'bw/diff-opt-impl-to-bitfields'

2017-11-09 14:31:27 +09:00

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

refs: convert dwim_ref and expand_ref to struct object_id

2017-10-16 11:05:51 +09:00

merge-file.c

…

merge-index.c

…

merge-ours.c

Merge branch 'bw/diff-opt-impl-to-bitfields'

2017-11-09 14:31:27 +09:00

merge-recursive.c

…

merge-tree.c

…

merge.c

refs: convert dwim_ref and expand_ref to struct object_id

2017-10-16 11:05:51 +09:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

Merge branch 'mg/timestamp-t-fix' into maint

2017-10-18 14:19:09 +09:00

notes.c

refs: convert resolve_refdup and refs_resolve_refdup to struct object_id

2017-10-16 11:05:50 +09:00

pack-objects.c

refs: convert peel_ref to struct object_id

2017-10-16 11:05:51 +09:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

pull.c

Merge branch 'bc/object-id'

2017-11-06 14:24:27 +09:00

push.c

builtin/push.c: add push.pushOption config

2017-10-24 09:57:54 +09:00

read-tree.c

…

rebase--helper.c

…

receive-pack.c

Convert check_connected to use struct object_id

2017-10-16 11:05:50 +09:00

reflog.c

refs: convert reflog_expire parameter to struct object_id

2017-10-16 11:05:51 +09:00

remote-ext.c

consistently use "fallthrough" comments in switches

2017-09-22 12:49:57 +09:00

remote-fd.c

…

remote.c

Merge branch 'bc/object-id'

2017-11-06 14:24:27 +09:00

repack.c

…

replace.c

refs: convert read_ref and read_ref_full to object_id

2017-10-16 11:05:50 +09:00

rerere.c

…

reset.c

Merge branch 'bw/diff-opt-impl-to-bitfields'

2017-11-09 14:31:27 +09:00

rev-list.c

Merge branch 'bw/diff-opt-impl-to-bitfields'

2017-11-09 14:31:27 +09:00

rev-parse.c

Merge branch 'mh/packed-ref-store-prep' into maint

2017-10-18 14:18:58 +09:00

revert.c

…

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

Merge branch 'bc/object-id'

2017-11-06 14:24:27 +09:00

show-ref.c

refs: convert peel_ref to struct object_id

2017-10-16 11:05:51 +09:00

stripspace.c

…

submodule--helper.c

Merge branch 'bc/object-id'

2017-11-06 14:24:27 +09:00

symbolic-ref.c

refs: pass NULL to resolve_ref_unsafe() if hash is not needed

2017-09-24 10:18:21 +09:00

tag.c

Merge branch 'bc/object-id'

2017-11-06 14:24:27 +09:00

unpack-file.c

Merge branch 'jk/write-in-full-fix'

2017-09-25 15:24:06 +09:00

unpack-objects.c

cleanup: fix possible overflow errors in binary search

2017-10-10 08:57:24 +09:00

update-index.c

refs: convert resolve_gitlink_ref to struct object_id

2017-10-16 11:05:51 +09:00

update-ref.c

refs: update ref transactions to use struct object_id

2017-10-16 11:05:50 +09:00

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

worktree: convert struct worktree to object_id

2017-10-16 11:05:51 +09:00

write-tree.c

…