Junio C Hamano 54bc41416c Merge branch 'jk/merge-file-exit-code' ...

"git merge-file" tried to signal how many conflicts it found, which
obviously would not work well when there are too many of them.

* jk/merge-file-exit-code:
  merge-file: clamp exit code to maximum 127

2015-10-30 13:07:08 -07:00

..

add.c

Merge branch 'jc/add-u-A-default-to-top'

2015-10-30 13:06:55 -07:00

am.c

Merge branch 'jc/am-mailinfo-direct'

2015-10-29 13:59:23 -07:00

annotate.c

annotate: use argv_array

2014-07-16 11:10:11 -07:00

apply.c

apply: convert root string to strbuf

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

archive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

bisect--helper.c

…

blame.c

Merge branch 'mk/blame-error-message'

2015-10-30 13:07:02 -07:00

branch.c

Merge branch 'tk/stripspace'

2015-10-26 15:55:20 -07:00

bundle.c

bundle: verify arguments more strictly

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

cat-file.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

check-attr.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

check-ignore.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07: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

use strbuf_complete to conditionally append slash

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

clone.c

clone: allow "--dissociate" without reference

2015-10-22 12:13:29 -07:00

column.c

standardize usage info string format

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

commit-tree.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

commit.c

strbuf: make stripspace() part of strbuf

2015-10-16 09:45:15 -07:00

config.c

config: use xstrfmt in normalize_value

2015-09-25 10:18:18 -07:00

count-objects.c

count-objects: report unused files in $GIT_DIR/worktrees/...

2014-12-01 11:00:18 -08:00

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

lockfile.h: extract new header file for the functions in lockfile.c

2014-10-01 13:56:14 -07:00

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

use alloc_ref rather than hand-allocating "struct ref"

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

fmt-merge-msg.c

Merge branch 'rs/pop-commit'

2015-10-30 13:07:03 -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 'jk/war-on-sprintf'

2015-10-20 15:24:01 -07:00

gc.c

Merge branch 'js/misc-fixes'

2015-10-30 13:07:00 -07:00

get-tar-commit-id.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

grep.c

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

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

hash-object.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

help.c

convert strncpy to memcpy

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

index-pack.c

use xsnprintf for generating git object headers

2015-09-25 10:18:18 -07:00

init-db.c

init: use strbufs to store paths

2015-10-05 11:07:04 -07:00

interpret-trailers.c

trailer: add interpret-trailers command

2014-10-13 13:55:27 -07:00

log.c

use strbuf_complete to conditionally append slash

2015-10-05 11:08:06 -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

Merge branch 'jk/war-on-sprintf'

2015-10-20 15:24:01 -07:00

ls-tree.c

convert trivial sprintf / strcpy calls to xsnprintf

2015-09-25 10:18:18 -07:00

mailinfo.c

mailinfo: libify

2015-10-21 15:59:34 -07:00

mailsplit.c

mailsplit: make PATH_MAX buffers dynamic

2015-09-25 10:18:18 -07:00

merge-base.c

standardize usage info string format

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

merge-file.c

Merge branch 'jk/merge-file-exit-code'

2015-10-30 13:07:08 -07:00

merge-index.c

use sha1_to_hex_r() instead of strcpy

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

merge-ours.c

…

merge-recursive.c

convert trivial sprintf / strcpy calls to xsnprintf

2015-09-25 10:18:18 -07:00

merge-tree.c

react to errors in xdi_diff

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

merge.c

Merge branch 'rs/pop-commit'

2015-10-30 13:07:03 -07:00

mktag.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

mktree.c

builtin/mktree.c: use ALLOC_GROW() in append_to_tree()

2014-03-03 14:54:45 -08:00

mv.c

standardize usage info string format

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

name-rev.c

name-rev: use strip_suffix to avoid magic numbers

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

notes.c

Merge branch 'tk/stripspace'

2015-10-26 15:55:20 -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

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

prune-packed.c

standardize usage info string format

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

prune.c

Merge branch 'jk/repository-extension'

2015-10-26 15:55:25 -07:00

pull.c

Merge branch 'pt/pull-builtin' into maint

2015-10-16 14:32:32 -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

convert trivial sprintf / strcpy calls to xsnprintf

2015-09-25 10:18:18 -07:00

receive-pack.c

receive-pack: simplify keep_arg computation

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

reflog.c

Merge branch 'rs/pop-commit'

2015-10-30 13:07:03 -07:00

remote-ext.c

remote-ext: simplify git pkt-line generation

2015-09-25 10:18:18 -07:00

remote-fd.c

…

remote.c

Merge branch 'bb/remote-get-url'

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

repack.c

Merge branch 'jk/repository-extension'

2015-10-26 15:55:25 -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

use sha1_to_hex_r() instead of strcpy

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

rev-parse.c

use pop_commit() for consuming the first entry of a struct commit_list

2015-10-26 14:06:46 -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

Merge branch 'rs/pop-commit'

2015-10-30 13:07:03 -07:00

show-ref.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

stripspace.c

Merge branch 'tk/stripspace'

2015-10-26 15:55:20 -07:00

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-26 15:55:22 -07:00

unpack-file.c

convert trivial sprintf / strcpy calls to xsnprintf

2015-09-25 10:18:18 -07:00

unpack-objects.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -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

upload-archive: convert sprintf to strbuf

2015-09-25 10:18:18 -07:00

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 'es/worktree-add'

2015-10-26 15:55:21 -07:00

write-tree.c

…