Junio C Hamano 31d69db340 Merge branch 'jc/maint-log-grep-all-match-1' into maint ...

* jc/maint-log-grep-all-match-1:
  grep.c: make two symbols really file-scope static this time
  t7810-grep: test --all-match with multiple --grep and --author options
  t7810-grep: test interaction of multiple --grep and --author options
  t7810-grep: test multiple --author with --all-match
  t7810-grep: test multiple --grep with and without --all-match
  t7810-grep: bring log --grep tests in common form
  grep.c: mark private file-scope symbols as static
  log: document use of multiple commit limiting options
  log --grep/--author: honor --all-match honored for multiple --grep patterns
  grep: show --debug output only once
  grep: teach --debug option to dump the parse tree

2012-09-29 22:30:56 -07:00

..

add.c

Merge branch 'ar/clone-honor-umask-at-top' into maint

2012-07-22 13:04:05 -07:00

annotate.c

…

apply.c

Merge branch 'maint-1.7.11' into maint

2012-09-12 14:08:05 -07:00

archive.c

Revert "upload-archive: use start_command instead of fork"

2011-11-15 15:39:33 -08:00

bisect--helper.c

bisect: introduce support for --no-checkout option.

2011-08-04 15:34:32 -07:00

blame.c

Merge branch 'jc/maint-blame-no-such-path' into maint

2012-09-24 12:40:02 -07:00

branch.c

branch: remove lego in i18n tracking info strings

2012-05-04 09:12:24 -07:00

bundle.c

Teach progress eye-candy to fetch_refs_from_bundle()

2011-09-19 11:07:21 -07:00

cat-file.c

Merge branch 'maint-1.7.11' into maint

2012-09-10 15:31:06 -07:00

check-attr.c

Add missing -z to git check-attr usage text for consistency with man page

2012-09-17 13:45:32 -07:00

check-ref-format.c

Change check_refname_format() to reject unnormalized refnames

2011-10-05 13:45:30 -07:00

checkout-index.c

checkout-index: remove obsolete comment

2011-08-17 10:39:47 -07:00

checkout.c

Sync with 1.7.11.6

2012-09-11 11:23:54 -07:00

clean.c

Documentation: clarify "git clean -e <pattern>"

2011-08-28 23:47:55 -07:00

clone.c

Merge branch 'ar/clone-honor-umask-at-top' into maint

2012-07-22 13:04:05 -07:00

column.c

Add column layout skeleton and git-column

2012-04-27 09:26:37 -07:00

commit-tree.c

Merge branch 'kk/maint-commit-tree'

2012-07-23 20:55:54 -07:00

commit.c

split_ident_line(): make best effort when parsing author/committer line

2012-08-31 14:54:18 -07:00

config.c

Merge branch 'jk/config-warn-on-inaccessible-paths' into maint

2012-09-18 14:24:06 -07:00

count-objects.c

add description parameter to OPT__VERBOSE

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

credential.c

git credential fill: output the whole 'struct credential'

2012-06-25 11:56:24 -07:00

describe.c

describe: Refresh the index when run with --dirty

2011-09-23 14:28:17 -07:00

diff-files.c

Convert struct diff_options to use struct pathspec

2011-02-03 12:28:15 -08:00

diff-index.c

…

diff-tree.c

diffcore-rename: fall back to -C when -C -C busts the rename limit

2011-03-22 14:29:07 -07:00

diff.c

Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

2012-09-11 10:53:40 -07:00

fast-export.c

Merge branch 'js/fast-export-paths-with-spaces' into maint

2012-07-22 13:00:45 -07:00

fetch-pack.c

fetch-pack: mention server version with verbose output

2012-08-13 21:56:05 -07:00

fetch.c

Merge branch 'dj/fetch-all-tags' into maint

2012-09-24 12:39:21 -07:00

fmt-merge-msg.c

Merge branch 'jc/fmt-merge-msg-people'

2012-06-12 08:33:30 -07:00

for-each-ref.c

for-each-ref: Fix sort with multiple keys

2012-08-21 14:42:12 -07:00

fsck.c

fsck: use streaming API for writing lost-found blobs

2012-03-07 09:07:39 -08:00

gc.c

gc: use argv-array for sub-commands

2012-04-18 16:17:42 -07:00

grep.c

Merge branch 'jc/maint-log-grep-all-match-1' into maint

2012-09-29 22:30:56 -07:00

hash-object.c

index_fd(): turn write_object and format_check arguments into one flag

2011-05-09 11:58:19 -07:00

help.c

Merge branch 'cw/help-over-network'

2012-07-09 09:02:19 -07:00

index-pack.c

Merge branch 'jk/index-pack-streaming-fix'

2012-07-15 21:40:07 -07:00

init-db.c

git on Mac OS and precomposed unicode

2012-07-08 22:03:46 -07:00

log.c

Merge branch 'mz/cherry-pick-cmdline-order' into maint

2012-09-14 21:24:18 -07:00

ls-files.c

path_excluded(): update API to less cache-entry centric

2012-06-05 21:22:36 -07:00

ls-remote.c

ls-remote: document the '--get-url' option

2012-09-07 10:58:35 -07:00

ls-tree.c

Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.

2011-07-25 10:50:11 -07:00

mailinfo.c

Merge branch 'jc/maint-mailinfo-mime-attr' into maint

2012-09-29 22:30:48 -07:00

mailsplit.c

Use parentheses and `...' where appropriate

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

merge-base.c

Documentation: update to git-merge-base --octopus

2011-04-15 10:13:52 -07:00

merge-file.c

remove superfluous newlines in error messages

2012-04-30 15:45:51 -07:00

merge-index.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

merge-ours.c

…

merge-recursive.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

merge-tree.c

sparse: Fix an "symbol 'merge_file' not decared" warning

2011-04-11 10:35:25 -07:00

merge.c

Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

2012-09-11 10:53:40 -07:00

mktag.c

read_sha1_file(): get rid of read_sha1_file_repl() madness

2011-05-15 15:23:33 -07:00

mktree.c

Merge "Move 'builtin-*' into a 'builtin/' subdirectory"

2011-11-10 09:10:51 -08:00

mv.c

Merge branch 'jk/maint-mv' into maint

2011-12-28 11:32:36 -08:00

name-rev.c

Merge branch 'jc/maint-name-rev-all' into maint-1.7.6

2011-12-13 21:12:34 -08:00

notes.c

Merge branch 'nd/war-on-nul-in-commit'

2011-12-22 11:27:26 -08:00

pack-objects.c

Merge branch 'jc/sha1-name-more'

2012-07-22 12:55:07 -07:00

pack-redundant.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

pack-refs.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

patch-id.c

patch-id.c: use strbuf instead of a fixed buffer

2011-09-22 09:35:07 -07:00

prune-packed.c

fix deletion of .git/objects sub-directories in git-prune/repack

2012-03-07 10:24:33 -08:00

prune.c

prune.c: only print informational message in show_only or verbose mode

2012-08-07 15:01:37 -07:00

push.c

Merge branch 'ct/advise-push-default' into maint

2012-05-11 11:18:43 -07:00

read-tree.c

Teach read-tree the -n|--dry-run option

2011-05-25 15:04:25 -07:00

receive-pack.c

Merge branch 'jc/capabilities' into maint

2012-09-11 11:06:45 -07:00

reflog.c

reflog: remove i18n legos in pruning message

2012-06-07 11:49:16 -07:00

remote-ext.c

Remove unused variables

2011-03-22 11:43:27 -07:00

remote-fd.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

remote.c

remote: prefer subcommand name 'remove' to 'rm'

2012-09-06 13:23:22 -07:00

replace.c

Convert many resolve_ref() calls to read_ref*() and ref_exists()

2011-11-13 12:21:06 -08:00

rerere.c

rerere: libify rerere_clear() and rerere_gc()

2011-05-08 12:55:34 -07:00

reset.c

Merge branch 'jc/sha1-name-more'

2012-07-22 12:55:07 -07:00

rev-list.c

Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint

2012-05-14 11:46:16 -07:00

rev-parse.c

Merge branch 'maint-1.7.11' into maint

2012-09-12 14:08:05 -07:00

revert.c

cherry-pick/revert: respect order of revisions to pick

2012-08-30 14:00:23 -07:00

rm.c

i18n: git-rm basic messages

2011-03-09 23:52:56 -08:00

send-pack.c

do not send client agent unless server does first

2012-08-10 12:35:13 -07:00

shortlog.c

Merge branch 'jk/format-patch-am'

2011-05-31 12:19:11 -07:00

show-branch.c

Rename resolve_ref() to resolve_ref_unsafe()

2011-12-13 09:39:46 -08:00

show-ref.c

Convert many resolve_ref() calls to read_ref*() and ref_exists()

2011-11-13 12:21:06 -08:00

stripspace.c

Update documentation for stripspace

2011-12-12 16:48:54 -08:00

symbolic-ref.c

symbolic-ref --short: abbreviate the output unambiguously

2012-02-27 15:58:36 -08:00

tag.c

ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT

2012-05-24 17:16:41 -07:00

tar-tree.c

…

unpack-file.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

unpack-objects.c

remove superfluous newlines in error messages

2012-04-30 15:45:51 -07:00

update-index.c

Merge branch 'hv/submodule-update-nuke-submodules' into maint

2012-07-11 12:46:31 -07:00

update-ref.c

update-ref: whitespace fix

2011-08-25 14:42:11 -07:00

update-server-info.c

update-server-info: respect core.bigfilethreshold

2012-03-07 09:07:39 -08:00

upload-archive.c

upload-archive: use start_command instead of fork

2011-11-21 14:32:40 -08:00

var.c

ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT

2012-05-24 17:16:41 -07:00

verify-pack.c

verify-pack: use index-pack --verify

2011-06-05 22:45:38 -07:00

verify-tag.c

verify-tag: Parse GPG configuration options.

2012-03-08 14:03:07 -08:00

write-tree.c

…