Junio C Hamano 5cf00cbc0f Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff ...

* es/format-patch-interdiff:
  format-patch: allow --interdiff to apply to a lone-patch
  log-tree: show_log: make commentary block delimiting reusable
  interdiff: teach show_interdiff() to indent interdiff
  format-patch: teach --interdiff to respect -v/--reroll-count
  format-patch: add --interdiff option to embed diff in cover letter
  format-patch: allow additional generated content in make_cover_letter()

2018-08-14 14:23:53 -07:00

..

add.c

Merge branch 'ma/lockfile-cleanup'

2018-05-30 14:04:05 +09:00

am.c

Merge branch 'en/dirty-merge-fixes'

2018-08-02 15:30:45 -07:00

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'is/parsing-line-range'

2018-08-02 15:30:41 -07:00

branch.c

Merge branch 'sb/object-store-lookup'

2018-08-02 15:30:42 -07:00

bundle.c

…

cat-file.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'jm/cache-entry-from-mem-pool'

2018-08-02 15:30:43 -07:00

clean.c

help: add --config to list all available config

2018-05-29 14:51:28 +09:00

clone.c

Merge branch 'sb/object-store-lookup'

2018-08-02 15:30:42 -07:00

column.c

column: fix off-by-one default width

2018-05-13 10:45:05 +09:00

commit-graph.c

commit-graph: add free_commit_graph

2018-07-17 15:47:48 -07:00

commit-tree.c

commit: add repository argument to lookup_commit

2018-06-29 10:43:39 -07:00

commit.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

config.c

Merge branch 'tb/config-default'

2018-07-24 14:50:46 -07:00

count-objects.c

…

credential.c

…

describe.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

commit: add repository argument to lookup_commit

2018-06-29 10:43:39 -07:00

diff.c

tag: add repository argument to deref_tag

2018-06-29 10:43:39 -07:00

difftool.c

Merge branch 'jm/cache-entry-from-mem-pool'

2018-08-02 15:30:43 -07:00

fast-export.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

fetch-pack.c

Merge branch 'bw/protocol-v2'

2018-05-08 15:59:16 +09:00

fetch.c

Merge branch 'jt/fetch-nego-tip'

2018-08-02 15:30:43 -07:00

fmt-merge-msg.c

Merge branch 'sb/object-store-lookup'

2018-08-02 15:30:42 -07:00

for-each-ref.c

…

fsck.c

Merge branch 'sb/object-store-lookup'

2018-08-02 15:30:42 -07:00

gc.c

Merge branch 'kg/gc-auto-windows-workaround'

2018-08-02 15:30:43 -07:00

get-tar-commit-id.c

…

grep.c

Merge branch 'tb/grep-only-matching'

2018-08-02 15:30:44 -07:00

hash-object.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

help.c

Merge branch 'nd/command-list'

2018-06-01 15:06:37 +09:00

index-pack.c

blob: add repository argument to lookup_blob

2018-06-29 10:43:38 -07:00

init-db.c

Merge branch 'rd/init-typo'

2018-06-01 15:06:40 +09:00

interpret-trailers.c

…

log.c

Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff

2018-08-14 14:23:53 -07:00

ls-files.c

Merge branch 'nd/use-opt-int-set-f'

2018-06-01 15:06:38 +09:00

ls-remote.c

Merge branch 'bw/server-options'

2018-05-23 14:38:15 +09:00

ls-tree.c

object-store: move object access functions to object-store.h

2018-05-16 11:42:03 +09:00

mailinfo.c

…

mailsplit.c

…

merge-base.c

commit: add repository argument to lookup_commit

2018-06-29 10:43:39 -07:00

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

builtin/merge-recursive: make hash independent

2018-07-16 14:27:39 -07:00

merge-tree.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

merge.c

Merge branch 'js/rebase-merge-octopus'

2018-08-02 15:30:44 -07:00

mktag.c

object-store: move object access functions to object-store.h

2018-05-16 11:42:03 +09:00

mktree.c

object-store: move object access functions to object-store.h

2018-05-16 11:42:03 +09:00

mv.c

Merge branch 'ma/lockfile-cleanup'

2018-05-30 14:04:05 +09:00

name-rev.c

tag: add repository argument to deref_tag

2018-06-29 10:43:39 -07:00

notes.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

pack-objects.c

Merge branch 'sb/object-store-lookup'

2018-08-02 15:30:42 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

object: add repository argument to lookup_object

2018-06-29 10:43:38 -07:00

pull.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

push.c

transport: convert transport_push to take a struct refspec

2018-05-18 06:19:44 +09:00

range-diff.c

range-diff: make --dual-color the default mode

2018-08-13 10:44:52 -07:00

read-tree.c

lock_file: move static locks into functions

2018-05-10 14:55:40 +09:00

rebase--helper.c

…

receive-pack.c

Merge branch 'sb/object-store-lookup'

2018-08-02 15:30:42 -07:00

reflog.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

repack.c

…

replace.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

rerere.c

…

reset.c

Merge branch 'jm/cache-entry-from-mem-pool'

2018-08-02 15:30:43 -07:00

rev-list.c

Merge branch 'sb/object-store-lookup'

2018-08-02 15:30:42 -07:00

rev-parse.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

revert.c

…

rm.c

Merge branch 'ma/lockfile-cleanup'

2018-05-30 14:04:05 +09:00

send-pack.c

Merge branch 'ms/send-pack-honor-config'

2018-06-28 12:53:30 -07:00

serve.c

…

shortlog.c

…

show-branch.c

commit: add repository argument to lookup_commit_reference

2018-06-29 10:43:39 -07:00

show-index.c

make show-index a builtin

2018-05-29 00:28:22 +09:00

show-ref.c

object-store: move object access functions to object-store.h

2018-05-16 11:42:03 +09:00

stripspace.c

…

submodule--helper.c

Merge branch 'ao/config-from-gitmodules'

2018-07-18 12:20:31 -07:00

symbolic-ref.c

…

tag.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

unpack-file.c

object-store: move object access functions to object-store.h

2018-05-16 11:42:03 +09:00

unpack-objects.c

Merge branch 'sb/object-store-grafts'

2018-07-18 12:20:28 -07:00

update-index.c

Merge branch 'jm/cache-entry-from-mem-pool'

2018-08-02 15:30:43 -07:00

update-ref.c

update-ref --stdin: use skip_prefix()

2018-06-04 12:26:01 +09:00

update-server-info.c

…

upload-archive.c

…

upload-pack.c

Merge branch 'bw/protocol-v2'

2018-05-08 15:59:16 +09:00

var.c

…

verify-commit.c

commit: add repository argument to lookup_commit

2018-06-29 10:43:39 -07:00

verify-pack.c

…

verify-tag.c

…

worktree.c

checkout: pass the "num_matches" up to callers

2018-06-11 09:41:01 -07:00

write-tree.c

…