Junio C Hamano 51a0908a6f Merge branch 'pt/am-builtin' ...

When "git am" was rewritten as a built-in, it stopped paying
attention to user.signingkey, which was fixed.

* pt/am-builtin:
  am: configure gpg at startup

2015-10-15 15:43:40 -07:00

..

add.c

Merge branch 'sb/remove-unused-var-from-builtin-add' into maint

2015-08-19 14:41:33 -07:00

am.c

Merge branch 'pt/am-builtin'

2015-10-15 15:43:40 -07:00

annotate.c

…

apply.c

Merge branch 'gb/apply-comment-typofix'

2015-09-14 11:44:44 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Sync with 2.6.1

2015-10-05 13:20:08 -07:00

branch.c

Merge branch 'kn/for-each-branch'

2015-10-15 15:43:38 -07:00

bundle.c

bundle: verify arguments more strictly

2015-05-08 10:52:11 -07:00

cat-file.c

cat-file: sort and de-dup output of --batch-all-objects

2015-06-26 09:24:42 -07:00

check-attr.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

check-ignore.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

check-mailmap.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

check-ref-format.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

checkout-index.c

prefix_path(): unconditionally free results in the callers

2015-05-05 10:31:51 -07:00

checkout.c

Merge branch 'jc/calloc-pathspec' into maint

2015-09-03 19:18:00 -07:00

clean.c

Merge branch 'rs/janitorial' into maint

2015-06-16 14:33:47 -07:00

clone.c

clone: better error when --reference is a linked checkout

2015-09-28 10:46:36 -07:00

column.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

commit-tree.c

commit-tree: simplify parsing of option -S using skip_prefix()

2014-12-29 09:32:45 -08:00

commit.c

Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update'

2015-09-01 16:31:29 -07:00

config.c

get_urlmatch: avoid useless strbuf write

2015-08-20 13:16:50 -07:00

count-objects.c

…

credential.c

…

describe.c

Merge branch 'sg/describe-contains'

2015-08-31 15:39:10 -07:00

diff-files.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

diff-index.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

diff-tree.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

diff.c

…

fast-export.c

refs: move the remaining ref module declarations to refs.h

2015-06-22 13:17:12 -07:00

fetch-pack.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

fetch.c

Merge branch 'mh/get-remote-group-fix' into maint

2015-09-03 19:17:48 -07:00

fmt-merge-msg.c

refs: move the remaining ref module declarations to refs.h

2015-06-22 13:17:12 -07:00

for-each-ref.c

ref-filter: add option to match literal pattern

2015-09-17 10:02:49 -07:00

fsck.c

Merge branch 'jc/fsck-dropped-errors'

2015-10-15 15:43:35 -07:00

gc.c

Merge branch 'nd/gc-auto-background-fix'

2015-10-15 15:43:33 -07:00

get-tar-commit-id.c

…

grep.c

Merge branch 'ps/grep-help-all-callback-arg'

2015-04-20 15:28:34 -07:00

hash-object.c

Merge branch 'jc/hash-object' into maint

2015-05-26 13:49:25 -07:00

help.c

Merge branch 'sb/leaks'

2015-03-20 13:11:53 -07:00

index-pack.c

Merge branch 'jc/finalize-temp-file'

2015-08-19 14:48:55 -07:00

init-db.c

write_file(): drop caller-supplied LF from calls to create a one-liner file

2015-08-25 12:49:19 -07:00

interpret-trailers.c

…

log.c

builtin/log.c: minor reformat

2015-08-25 13:11:21 -07:00

ls-files.c

ps_matched: xcalloc() takes nmemb and then element size

2015-08-20 09:57:38 -07:00

ls-remote.c

ls-remote.txt: delete unsupported option

2015-09-28 11:07:04 -07:00

ls-tree.c

…

mailinfo.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

mailsplit.c

…

merge-base.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

merge-file.c

Sync with 2.3.10

2015-09-28 15:28:31 -07:00

merge-index.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

react to errors in xdi_diff

2015-09-28 14:57:10 -07:00

merge.c

memoize common git-path "constant" files

2015-08-10 15:37:14 -07:00

mktag.c

…

mktree.c

…

mv.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

name-rev.c

name_ref(): rewrite to take an object_id argument

2015-05-25 12:19:29 -07:00

notes.c

Merge branch 'jk/notes-merge-config'

2015-08-31 15:39:05 -07:00

pack-objects.c

Merge branch 'ah/pack-objects-usage-strings'

2015-09-01 16:31:12 -07:00

pack-redundant.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

pack-refs.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

patch-id.c

patch-id: convert to use struct object_id

2015-03-13 22:43:14 -07:00

prune-packed.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

prune.c

Merge branch 'nd/multiple-work-trees'

2015-07-13 14:02:02 -07:00

pull.c

pull: don't mark values for option "rebase" for translation

2015-09-11 09:50:00 -07:00

push.c

push: add a config option push.gpgSign for default signed pushes

2015-08-19 12:58:58 -07:00

read-tree.c

Merge branch 'ah/read-tree-usage-string'

2015-09-01 16:31:16 -07:00

receive-pack.c

Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint

2015-08-19 14:41:26 -07:00

reflog.c

Merge branch 'ah/reflog-typofix-in-error'

2015-09-01 16:31:18 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'bb/remote-get-url'

2015-10-05 12:30:25 -07:00

repack.c

prefer mkpathdup to mkpath in assignments

2015-08-10 15:37:12 -07:00

replace.c

Merge branch 'mh/replace-refs'

2015-08-03 11:01:10 -07:00

rerere.c

Sync with 2.6.1

2015-10-05 13:20:08 -07:00

reset.c

memoize common git-path "constant" files

2015-08-10 15:37:14 -07:00

rev-list.c

rev-list: make it obvious that we do not support notes

2015-08-24 10:33:15 -07:00

rev-parse.c

rev-parse --parseopt: allow [*=?!] in argument hints

2015-07-15 10:30:54 -07:00

revert.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

rm.c

use file_exists() to check if a file exists in the worktree

2015-05-20 13:49:10 -07:00

send-pack.c

push: add a config option push.gpgSign for default signed pushes

2015-08-19 12:58:58 -07:00

shortlog.c

convert "enum date_mode" into a struct

2015-06-29 11:39:07 -07:00

show-branch.c

Sync with 2.5.2

2015-09-09 14:30:35 -07:00

show-ref.c

show-ref: place angle brackets around variables in usage string

2015-08-31 09:33:53 -07:00

stripspace.c

…

submodule--helper.c

submodule: rewrite module_clone shell function in C

2015-09-08 15:48:21 -07:00

symbolic-ref.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

tag.c

Merge branch 'kn/for-each-tag'

2015-10-05 12:30:18 -07:00

unpack-file.c

…

unpack-objects.c

fsck (receive-pack): allow demoting errors to warnings

2015-06-23 14:27:34 -07:00

update-index.c

Merge branch 'nd/untracked-cache'

2015-05-26 13:24:46 -07:00

update-ref.c

tag, update-ref: improve description of option "create-reflog"

2015-09-11 09:50:02 -07:00

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-commit.c

verify-commit: add option to print raw gpg status information

2015-06-22 14:20:47 -07:00

verify-pack.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

verify-tag.c

verify-tag: add option to print raw gpg status information

2015-06-22 14:20:47 -07:00

worktree.c

Merge branch 'jc/am-state-fix'

2015-08-31 15:39:03 -07:00

write-tree.c

…