Junio C Hamano 3e5c63943d Merge branch 'rl/remote-allow-missing-branch-name-merge' ...

"git remote rm X", when a branch has remote X configured as the
value of its branch.*.remote, tried to remove branch.*.remote and
branch.*.merge and failed if either is unset.

* rl/remote-allow-missing-branch-name-merge:
  remote: ignore failure to remove missing branch.<name>.merge

2017-02-27 13:57:18 -08:00

..

add.c

hold_locked_index(): align error handling with hold_lockfile_for_update()

2016-12-07 11:31:59 -08:00

am.c

delete_ref: accept a reflog message argument

2017-02-20 22:04:47 -08:00

annotate.c

…

apply.c

Convert read_mmblob to take struct object_id.

2016-09-07 12:59:42 -07:00

archive.c

archive: read local configuration

2016-11-22 13:55:20 -08:00

bisect--helper.c

…

blame.c

Merge branch 'jk/blame-fixes' into maint

2017-01-31 13:32:07 -08:00

branch.c

Merge branch 'km/delete-ref-reflog-message'

2017-02-27 13:57:18 -08:00

bundle.c

…

cat-file.c

Merge branch 'jk/pack-objects-optim-mru'

2016-10-10 14:03:47 -07:00

check-attr.c

attr: tighten const correctness with git_attr and match_attr

2017-02-01 13:46:53 -08:00

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

hold_locked_index(): align error handling with hold_lockfile_for_update()

2016-12-07 11:31:59 -08:00

checkout.c

Merge branch 'cw/log-updates-for-all-refs-really'

2017-02-03 11:25:19 -08:00

clean.c

Merge branch 'nd/clean-preserve-errno-in-warning'

2017-02-27 13:57:16 -08:00

clone.c

Merge branch 'rs/absolute-pathdup'

2017-02-02 13:36:55 -08:00

column.c

…

commit-tree.c

builtin/commit-tree: convert to struct object_id

2016-09-07 12:59:43 -07:00

commit.c

builtin/commit.c: switch to strbuf, instead of snprintf()

2017-01-31 10:09:00 -08:00

config.c

i18n: config: mark error message for translation

2016-09-15 13:17:32 -07:00

count-objects.c

alternates: use fspathcmp to detect duplicates

2016-10-10 13:52:37 -07:00

credential.c

…

describe.c

describe: teach describe negative pattern matches

2017-01-23 18:33:17 -08:00

diff-files.c

…

diff-index.c

…

diff-tree.c

use SWAP macro

2017-01-30 14:17:00 -08:00

diff.c

use SWAP macro

2017-01-30 14:17:00 -08:00

difftool.c

difftool: fix bug when printing usage

2017-02-06 10:13:48 -08:00

fast-export.c

use QSORT

2016-09-29 15:42:18 -07:00

fetch-pack.c

Merge branch 'nd/shallow-deepen'

2016-10-10 14:03:50 -07:00

fetch.c

Merge branch 'js/remote-rename-with-half-configured-remote'

2017-01-31 13:14:59 -08:00

fmt-merge-msg.c

remove unnecessary check before QSORT

2016-09-29 15:42:18 -07:00

for-each-ref.c

tag, branch, for-each-ref: add --ignore-case for sorting and filtering

2016-12-05 14:59:29 -08:00

fsck.c

Merge branch 'jk/fsck-connectivity-check-fix'

2017-01-31 13:15:01 -08:00

gc.c

gc: ignore old gc.log files

2017-02-13 15:19:11 -08:00

get-tar-commit-id.c

…

grep.c

grep: treat revs the same for --untracked as for --no-index

2017-02-14 13:59:25 -08:00

hash-object.c

hash-object: always try to set up the git repository

2016-09-13 15:45:45 -07:00

help.c

Merge branch 'js/no-html-bypass-on-windows' into maint

2016-09-08 21:35:55 -07:00

index-pack.c

index-pack: skip collision check when not in repository

2016-12-16 13:57:19 -08:00

init-db.c

refs: add option core.logAllRefUpdates = always

2017-01-31 10:01:24 -08:00

interpret-trailers.c

…

log.c

Merge branch 'jt/format-patch-rfc'

2016-09-26 16:09:17 -07:00

ls-files.c

ls-files: move only kept cache entries in prune_cache()

2017-02-13 12:06:10 -08:00

ls-remote.c

…

ls-tree.c

ls-tree: convert show_recursive to use the pathspec struct interface

2017-01-08 18:04:17 -08:00

mailinfo.c

mailinfo: read local configuration

2016-11-22 13:13:16 -08:00

mailsplit.c

…

merge-base.c

merge-base: handle --fork-point without reflog

2016-10-12 14:30:16 -07:00

merge-file.c

…

merge-index.c

use oid_to_hex_r() for converting struct object_id hashes to hex strings

2017-01-30 14:23:40 -08:00

merge-ours.c

…

merge-recursive.c

i18n: merge-recursive: mark verbose message for translation

2016-09-15 13:17:32 -07:00

merge-tree.c

…

merge.c

Merge branch 'cp/merge-continue'

2016-12-27 00:11:41 -08:00

mktag.c

…

mktree.c

use QSORT

2016-09-29 15:42:18 -07:00

mv.c

Merge branch 'bw/pathspec-cleanup'

2017-01-18 15:12:15 -08:00

name-rev.c

name-rev: add support to exclude refs by pattern match

2017-01-23 18:33:17 -08:00

notes.c

delete_ref: accept a reflog message argument

2017-02-20 22:04:47 -08:00

pack-objects.c

Merge branch 'bw/attr'

2017-02-27 13:57:14 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

Merge branch 'rs/patch-id-use-skip-prefix'

2016-06-03 14:38:03 -07:00

prune-packed.c

…

prune.c

…

pull.c

Merge branch 'jc/pull-rebase-ff' into maint

2017-01-17 15:11:05 -08:00

push.c

Merge branch 'bw/push-submodule-only'

2017-01-31 13:14:56 -08:00

read-tree.c

read-tree: use OPT_BOOL instead of OPT_SET_INT

2017-01-11 13:17:16 -08:00

rebase--helper.c

rebase--helper: add a builtin helper for interactive rebases

2017-02-09 14:55:26 -08:00

receive-pack.c

receive-pack: avoid duplicates between our refs and alternates

2017-02-08 15:39:55 -08:00

reflog.c

…

remote-ext.c

pkt-line: rename packet_write() to packet_write_fmt()

2016-10-17 11:36:50 -07:00

remote-fd.c

…

remote.c

Merge branch 'rl/remote-allow-missing-branch-name-merge'

2017-02-27 13:57:18 -08:00

repack.c

repack: die on incremental + write-bitmap-index

2016-12-29 13:45:37 -08:00

replace.c

delete_ref: accept a reflog message argument

2017-02-20 22:04:47 -08:00

rerere.c

…

reset.c

delete_ref: accept a reflog message argument

2017-02-20 22:04:47 -08:00

rev-list.c

use oid_to_hex_r() for converting struct object_id hashes to hex strings

2017-01-30 14:23:40 -08:00

rev-parse.c

Merge branch 'js/git-path-in-subdir'

2017-02-27 13:57:17 -08:00

revert.c

sequencer: get rid of the subcommand field

2016-10-21 09:32:34 -07:00

rm.c

rm: reuse strbuf for all remove_dir_recursively() calls, again

2017-02-13 14:33:32 -08:00

send-pack.c

…

shortlog.c

shortlog: group by committer information

2016-12-15 16:19:13 -08:00

show-branch.c

Merge branch 'jk/show-branch-lift-name-len-limit'

2017-02-27 13:57:16 -08:00

show-ref.c

show-ref: remove a stale comment

2017-01-23 18:51:56 -08:00

stripspace.c

stripspace: respect repository config

2016-11-21 11:00:38 -08:00

submodule--helper.c

Merge branch 'rs/absolute-pathdup'

2017-02-02 13:36:55 -08:00

symbolic-ref.c

delete_ref: accept a reflog message argument

2017-02-20 22:04:47 -08:00

tag.c

Merge branch 'km/delete-ref-reflog-message'

2017-02-27 13:57:18 -08:00

unpack-file.c

…

unpack-objects.c

unpack-objects: add --max-input-size=<size> option

2016-08-24 12:31:05 -07:00

update-index.c

hold_locked_index(): align error handling with hold_lockfile_for_update()

2016-12-07 11:31:59 -08:00

update-ref.c

update-ref: pass reflog message to delete_ref()

2017-02-20 22:04:47 -08:00

update-server-info.c

…

upload-archive.c

archive: read local configuration

2016-11-22 13:55:20 -08:00

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

builtin/verify-tag: add --format to verify-tag

2017-01-17 16:10:22 -08:00

worktree.c

Merge branch 'ps/worktree-prune-help-fix'

2017-02-10 12:52:25 -08:00

write-tree.c

…