Junio C Hamano 5550449812 Merge branch 'ab/commit-m-with-fixup' ...

"git commit --fixup" did not allow "-m<message>" option to be used
at the same time; allow it to annotate resulting commit with more
text.

* ab/commit-m-with-fixup:
  commit: add support for --fixup <commit> -m"<extra message>"
  commit doc: document that -c, -C, -F and --fixup with -m error

2018-01-23 13:16:38 -08:00

..

add.c

Merge branch 'tb/add-renormalize'

2017-11-27 11:06:37 +09:00

am.c

Merge branch 'ew/empty-merge-with-dirty-index'

2018-01-05 13:28:09 -08:00

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

Merge branch 'ks/branch-cleanup'

2017-12-27 11:16:25 -08:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'rs/lose-leak-pending'

2018-01-23 13:16:36 -08:00

clean.c

…

clone.c

Merge branch 'jk/abort-clone-with-existing-dest'

2018-01-23 13:16:37 -08:00

column.c

…

commit-tree.c

…

commit.c

Merge branch 'ab/commit-m-with-fixup'

2018-01-23 13:16:38 -08:00

config.c

…

count-objects.c

…

credential.c

…

describe.c

Merge branch 'dk/describe-all-output-fix'

2018-01-23 13:16:28 -08:00

diff-files.c

…

diff-index.c

…

diff-tree.c

diff-tree: read the index so attribute checks work in bare repositories

2017-12-06 14:49:18 -08:00

diff.c

…

difftool.c

…

fast-export.c

decorate: clean up and document API

2017-12-08 09:16:27 -08:00

fetch-pack.c

…

fetch.c

Merge branch 'jt/transport-hide-vtable'

2017-12-28 14:08:47 -08:00

fmt-merge-msg.c

Merge branch 'rs/fmt-merge-msg-string-leak-fix'

2017-12-27 11:16:23 -08:00

for-each-ref.c

…

fsck.c

…

gc.c

…

get-tar-commit-id.c

…

grep.c

Merge branch 'bw/pathspec-match-submodule-boundary'

2017-12-19 11:33:56 -08:00

hash-object.c

…

help.c

…

index-pack.c

index-pack: use skip_to_optional_arg()

2017-12-11 16:10:12 -08:00

init-db.c

…

interpret-trailers.c

…

log.c

Merge branch 'sb/diff-blobfind-pickaxe'

2018-01-23 13:16:37 -08:00

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

merge: add config option for verifySignatures

2017-12-12 10:51:38 -08:00

mktag.c

…

mktree.c

…

mv.c

submodule: convert stage_updated_gitmodules to take a struct index_state

2017-12-12 12:35:20 -08:00

name-rev.c

…

notes.c

Merge branch 'ot/pretty'

2017-12-27 11:16:29 -08:00

pack-objects.c

Merge branch 'jh/object-filtering'

2017-12-27 11:16:21 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

Merge branch 'rd/man-prune-progress'

2017-12-06 09:23:39 -08:00

pull.c

Merge branch 'bc/hash-algo'

2017-12-13 13:28:54 -08:00

push.c

…

read-tree.c

…

rebase--helper.c

rebase -i: learn to abbreviate command names

2017-12-05 10:20:51 -08:00

receive-pack.c

Merge branch 'bw/protocol-v1'

2017-12-06 09:23:44 -08:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

…

replace.c

…

rerere.c

…

reset.c

Merge branch 'ot/pretty'

2017-12-27 11:16:29 -08:00

rev-list.c

Merge branch 'jh/object-filtering'

2017-12-27 11:16:21 -08:00

rev-parse.c

…

revert.c

…

rm.c

submodule: convert stage_updated_gitmodules to take a struct index_state

2017-12-12 12:35:20 -08:00

send-pack.c

…

shortlog.c

…

show-branch.c

Merge branch 'ot/pretty'

2017-12-27 11:16:29 -08:00

show-ref.c

…

stripspace.c

…

submodule--helper.c

Merge branch 'pc/submodule-helper'

2017-12-13 13:28:56 -08:00

symbolic-ref.c

…

tag.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

Merge branch 'es/worktree-checkout-hook'

2017-12-27 11:16:21 -08:00

write-tree.c

…