Junio C Hamano 2eb54692d1 Merge branch 'dg/local-mod-error-messages' ...

* dg/local-mod-error-messages:
  t7609: test merge and checkout error messages
  unpack_trees: group error messages by type
  merge-recursive: distinguish "removed" and "overwritten" messages
  merge-recursive: porcelain messages for checkout
  Turn unpack_trees_options.msgs into an array + enum

Conflicts:
	t/t3400-rebase.sh

2010-08-21 23:26:46 -07:00

..

add.c

…

annotate.c

…

apply.c

Teach "apply --index-info" to handle rename patches

2010-07-23 14:44:38 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'cc/find-commit-subject'

2010-08-18 12:46:55 -07:00

branch.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

Allow "check-ref-format --branch" from subdirectory

2010-08-06 10:01:45 -07:00

checkout-index.c

…

checkout.c

Merge branch 'dg/local-mod-error-messages'

2010-08-21 23:26:46 -07:00

clean.c

Add -e/--exclude to git-clean.

2010-07-20 16:52:53 -07:00

clone.c

…

commit-tree.c

…

commit.c

Merge branch 'jl/submodule-ignore-diff'

2010-08-18 12:36:25 -07:00

config.c

…

count-objects.c

…

describe.c

…

diff-files.c

Submodules: Use "ignore" settings from .gitmodules too for diff and status

2010-08-09 09:11:44 -07:00

diff-index.c

Submodules: Use "ignore" settings from .gitmodules too for diff and status

2010-08-09 09:11:44 -07:00

diff-tree.c

Submodules: Use "ignore" settings from .gitmodules too for diff and status

2010-08-09 09:11:44 -07:00

diff.c

Submodules: Use "ignore" settings from .gitmodules too for diff and status

2010-08-09 09:11:44 -07:00

fast-export.c

…

fetch-pack.c

…

fetch.c

Merge branch 'tf/string-list-init'

2010-08-18 12:47:04 -07:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

Merge branch 'tf/string-list-init'

2010-08-18 12:47:04 -07:00

hash-object.c

…

help.c

Cast execl*() NULL sentinels to (char *)

2010-07-25 23:14:18 -07:00

index-pack.c

index-pack: Don't follow replace refs.

2010-08-12 13:26:05 -07:00

init-db.c

…

log.c

…

ls-files.c

Merge branch 'ar/string-list-foreach'

2010-08-18 12:14:38 -07:00

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

unpack_trees: group error messages by type

2010-08-11 10:36:06 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

notes: allow --dry-run for -n and --verbose for -v

2010-08-09 10:12:50 -07:00

pack-objects.c

…

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

prune: allow --dry-run for -n and --verbose for -v

2010-08-09 10:13:18 -07:00

push.c

Merge branch 'maint'

2010-08-12 18:07:09 -07:00

read-tree.c

…

receive-pack.c

…

reflog.c

…

remote.c

…

replace.c

…

rerere.c

Merge branch 'tf/string-list-init'

2010-08-18 12:47:04 -07:00

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

Merge branch 'cc/find-commit-subject'

2010-08-18 12:46:55 -07:00

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

…

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…