Junio C Hamano cc34bb0b02 Merge branch 'jl/submodule-ignore-diff' ... * jl/submodule-ignore-diff: Add tests for the diff.ignoreSubmodules config option Add the 'diff.ignoreSubmodules' config setting Submodules: Use "ignore" settings from .gitmodules too for diff and status Submodules: Add the new "ignore" config option for diff and status Conflicts: diff.c		2010-08-18 12:36:25 -07:00
..
add.c	git add: Add the "--ignore-missing" option for the dry run	2010-07-12 15:13:54 -07:00
annotate.c	…
apply.c	Teach "apply --index-info" to handle rename patches	2010-07-23 14:44:38 -07:00
archive.c	…
bisect--helper.c	…
blame.c	Merge branch 'cp/textconv-cat-file'	2010-06-27 12:07:55 -07:00
branch.c	…
bundle.c	…
cat-file.c	Merge branch 'cp/textconv-cat-file'	2010-06-27 12:07:55 -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	…
checkout.c	Merge branch 'jn/fix-abbrev'	2010-08-18 12:28:58 -07:00
clean.c	Add -e/--exclude to git-clean.	2010-07-20 16:52:53 -07:00
clone.c	…
commit-tree.c	…
commit.c	Merge branch 'jl/submodule-ignore-diff'	2010-08-18 12:36:25 -07:00
config.c	…
count-objects.c	…
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	Submodules: Use "ignore" settings from .gitmodules too for diff and status	2010-08-09 09:11:44 -07:00
fast-export.c	string_list: Fix argument order for string_list_append	2010-06-27 10:06:52 -07:00
fetch-pack.c	…
fetch.c	Merge branch 'ar/string-list-foreach'	2010-08-18 12:14:38 -07:00
fmt-merge-msg.c	Merge branch 'jp/string-list-api-cleanup'	2010-06-30 11:55:38 -07:00
for-each-ref.c	…
fsck.c	…
gc.c	…
grep.c	Merge branch 'jn/grep-open'	2010-07-15 12:07:18 -07:00
hash-object.c	…
help.c	Cast execl*() NULL sentinels to (char *)	2010-07-25 23:14:18 -07:00
index-pack.c	index-pack: Don't follow replace refs.	2010-08-12 13:26:05 -07:00
init-db.c	…
log.c	Merge branch 'ar/decorate-color'	2010-06-30 11:55:40 -07:00
ls-files.c	Merge branch 'ar/string-list-foreach'	2010-08-18 12:14:38 -07:00
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-tree: fix where two branches share no changes	2010-07-14 12:56:49 -07:00
merge.c	…
mktag.c	…
mktree.c	…
mv.c	…
name-rev.c	…
notes.c	notes: allow --dry-run for -n and --verbose for -v	2010-08-09 10:12:50 -07:00
pack-objects.c	…
pack-redundant.c	…
pack-refs.c	…
patch-id.c	…
prune-packed.c	…
prune.c	prune: allow --dry-run for -n and --verbose for -v	2010-08-09 10:13:18 -07:00
push.c	Merge branch 'maint'	2010-08-12 18:07:09 -07:00
read-tree.c	Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix	2010-07-08 18:55:50 -07: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.c	Merge branch 'jp/string-list-api-cleanup'	2010-06-30 11:55:38 -07:00
replace.c	…
rerere.c	Merge branch 'js/merge-rr-fix'	2010-07-15 12:08:36 -07:00
reset.c	…
rev-list.c	…
rev-parse.c	Merge branch 'maint'	2010-07-07 11:18:26 -07:00
revert.c	revert: do not rebuild argv on heap	2010-06-29 10:36:13 -07:00
rm.c	…
send-pack.c	…
shortlog.c	string_list: Fix argument order for string_list_append	2010-06-27 10:06:52 -07:00
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-ref.c	…
update-server-info.c	…
upload-archive.c	…
var.c	…
verify-pack.c	…
verify-tag.c	…
write-tree.c	…