Junio C Hamano 07c55c00a5 Merge branch 'mm/checkout-auto-track-fix' into maint ...

"git checkout topic", when there is not yet a local "topic" branch
but there is a unique remote-tracking branch for a remote "topic"
branch, pretended as if "git checkout -t -b topic remote/$r/topic"
(for that unique remote $r) was run. This hack however was not
implemented for "git checkout topic --".

* mm/checkout-auto-track-fix:
  checkout: proper error message on 'git checkout foo bar --'
  checkout: allow dwim for branch creation for "git checkout $branch --"

2013-11-07 14:36:59 -08:00

..

add.c

Merge branch 'mm/color-auto-default'

2013-07-22 11:23:10 -07:00

annotate.c

…

apply.c

Sync with Git 1.8.3.4

2013-07-22 11:34:25 -07:00

archive.c

pkt-line: provide a LARGE_PACKET_MAX static buffer

2013-02-20 13:42:22 -08:00

bisect--helper.c

…

blame.c

Merge branch 'tr/line-log'

2013-06-02 16:00:44 -07:00

branch.c

branch: colour upstream branches

2013-04-15 11:04:44 -07:00

bundle.c

…

cat-file.c

Revert "cat-file: split --batch input lines on whitespace"

2013-08-02 09:29:30 -07:00

check-attr.c

…

check-ignore.c

Merge branch 'as/check-ignore'

2013-05-29 14:23:40 -07:00

check-mailmap.c

builtin: add git-check-mailmap command

2013-07-13 10:19:37 -07:00

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'mm/checkout-auto-track-fix' into maint

2013-11-07 14:36:59 -08:00

clean.c

Merge branch 'jx/clean-interactive'

2013-08-01 11:52:37 -07:00

clone.c

Merge branch 'jk/clone-progress-to-stderr' into maint

2013-10-28 10:19:24 -07:00

column.c

…

commit-tree.c

commit-tree: document -S option consistently

2013-03-25 15:01:22 -07:00

commit.c

commit: search author pattern against mailmap

2013-08-24 22:17:39 -07:00

config.c

Merge branch 'hv/config-from-blob'

2013-07-22 11:24:09 -07:00

count-objects.c

count-objects: add -H option to humanize sizes

2013-04-10 13:27:26 -07:00

credential.c

…

describe.c

describe: fix --contains when a tag is given as input

2013-07-18 15:16:23 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

cmd_diff(): make it obvious which cases are exclusive of each other

2013-05-28 09:25:01 -07:00

fast-export.c

many small typofixes

2013-07-29 12:32:25 -07:00

fetch-pack.c

Merge branch 'jk/pkt-line-cleanup'

2013-04-01 08:59:37 -07:00

fetch.c

builtin/fetch.c: Fix a sparse warning

2013-08-28 16:55:23 -07:00

fmt-merge-msg.c

Merge branch 'rt/commentchar-fmt-merge-msg' into maint

2013-04-26 11:10:47 -07:00

for-each-ref.c

…

fsck.c

fsck: don't put a void*-shaped peg in a char*-shaped hole

2013-05-28 09:25:01 -07:00

gc.c

…

grep.c

Merge branch 'jx/clean-interactive'

2013-07-22 11:24:11 -07:00

hash-object.c

…

help.c

Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint

2013-07-21 22:51:29 -07:00

index-pack.c

clone: open a shortcut for connectivity check

2013-05-28 08:07:20 -07:00

init-db.c

…

log.c

teach format-patch to place other authors into in-body "From"

2013-07-03 12:11:04 -07:00

ls-files.c

Merge branch 'jc/ls-files-killed-optim' into maint

2013-10-23 13:33:08 -07:00

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

mailsplit: sort maildir filenames more cleverly

2013-03-02 22:52:44 -08:00

merge-base.c

use logical OR (||) instead of binary OR (|) in logical context

2013-06-13 14:47:07 -07:00

merge-file.c

…

merge-index.c

Convert "struct cache_entry *" to "const ..." wherever possible

2013-07-09 09:12:48 -07:00

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

merge-tree: handle directory/empty conflict correctly

2013-05-06 22:17:00 -07:00

merge.c

Merge branch 'nd/const-struct-cache-entry'

2013-07-22 11:24:01 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

describe: fix --contains when a tag is given as input

2013-07-18 15:16:23 -07:00

notes.c

Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint

2013-07-21 22:51:29 -07:00

pack-objects.c

list-objects: reduce one argument in mark_edges_uninteresting

2013-08-28 11:54:18 -07:00

pack-redundant.c

…

pack-refs.c

pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}

2013-05-01 15:33:11 -07:00

patch-id.c

…

prune-packed.c

prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()

2013-05-28 09:20:54 -07:00

prune.c

Merge branch 'nd/prune-packed-dryrun-verbose'

2013-06-06 12:17:52 -07:00

push.c

many small typofixes

2013-07-29 12:32:25 -07:00

read-tree.c

diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const

2013-06-02 15:31:14 -07:00

receive-pack.c

Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maint

2013-04-26 11:12:17 -07:00

reflog.c

Merge branch 'jc/prune-all'

2013-05-29 14:23:04 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

remote: check for superfluous arguments in 'git remote add'

2013-04-24 13:12:51 -07:00

replace.c

fix "builtin-*" references to be "builtin/*"

2013-06-18 11:05:51 -07:00

rerere.c

…

reset.c

pretty: --format output should honor logOutputEncoding

2013-06-26 11:40:31 -07:00

rev-list.c

list-objects: reduce one argument in mark_edges_uninteresting

2013-08-28 11:54:18 -07:00

rev-parse.c

rev-parse: add --prefix option

2013-06-17 13:30:01 -07:00

revert.c

Add the LAST_ARG_MUST_BE_NULL macro

2013-07-19 09:26:15 -07:00

rm.c

Merge branch 'jc/rm-submodule-error-message'

2013-08-01 11:57:25 -07:00

send-pack.c

teach get_remote_heads to read from a memory buffer

2013-02-24 00:17:38 -08:00

shortlog.c

Merge branch 'jk/shortlog-tolerate-broken-commit' into maint

2013-10-28 10:17:31 -07:00

show-branch.c

Merge branch 'tr/do-not-call-submodules-subprojects'

2013-07-22 11:23:30 -07:00

show-ref.c

Merge branch 'db/show-ref-head'

2013-07-22 11:23:56 -07:00

stripspace.c

Allow custom "comment char"

2013-01-16 12:48:22 -08:00

symbolic-ref.c

…

tag.c

Merge branch 'ph/tag-force-no-warn-on-creation' into maint

2013-04-03 09:24:51 -07:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

Convert "struct cache_entry *" to "const ..." wherever possible

2013-07-09 09:12:48 -07:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

pkt-line: provide a LARGE_PACKET_MAX static buffer

2013-02-20 13:42:22 -08:00

var.c

…

verify-pack.c

…

verify-tag.c

gpg_interface: allow to request status return

2013-02-14 09:30:04 -08:00

write-tree.c

…