Junio C Hamano 977b4322c3 Merge branch 'mg/merge-ff-config' into next ...

* mg/merge-ff-config:
  tests: check git does not barf on merge.ff values for future versions of git
  merge: introduce merge.ff configuration variable

Conflicts:
	t/t7600-merge.sh

2011-05-08 13:35:24 -07:00

..

add.c

Merge branch 'jc/fix-add-u-unmerged' into next

2011-04-28 14:19:33 -07:00

annotate.c

…

apply.c

Merge branch 'jc/maint-add-p-overlapping-hunks' into next

2011-05-02 16:16:27 -07:00

archive.c

i18n: git-archive basic messages

2011-03-09 23:52:57 -08:00

bisect--helper.c

…

blame.c

Merge branch 'js/blame-parsename' into next

2011-04-29 12:08:21 -07:00

branch.c

Merge branch 'ab/i18n-st'

2011-04-01 17:55:55 -07:00

bundle.c

i18n: git-bundle basic messages

2011-03-09 23:52:57 -08:00

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'ab/i18n-fixup' into next

2011-04-25 14:55:39 -07:00

clean.c

i18n: git-clean clean.requireForce messages

2011-03-09 23:52:57 -08:00

clone.c

i18n: mark clone nonexistent repository message for translation

2011-04-12 00:12:53 -07:00

commit-tree.c

…

commit.c

Merge branch 'jc/index-update-if-able' into maint

2011-04-03 12:33:05 -07:00

config.c

Merge branch 'lp/config-vername-check' into maint

2011-04-03 12:29:45 -07:00

count-objects.c

…

describe.c

Merge branch 'lt/default-abbrev' into maint

2011-04-03 12:32:51 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

diffcore-rename: fall back to -C when -C -C busts the rename limit

2011-03-22 14:29:07 -07:00

diff.c

Merge branch 'jc/rename-degrade-cc-to-c' into next

2011-04-25 14:55:37 -07:00

fast-export.c

…

fetch-pack.c

Merge branch 'jc/fetch-progressive-stride'

2011-03-29 14:09:08 -07:00

fetch.c

Merge branch 'jl/submodule-fetch-on-demand'

2011-04-04 15:02:01 -07:00

fmt-merge-msg.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

for-each-ref.c

…

fsck.c

Remove unused variables

2011-03-22 11:43:27 -07:00

gc.c

i18n: git-gc "Auto packing the repository" message

2011-03-09 23:52:57 -08:00

grep.c

Merge branch 'nd/struct-pathspec' into next

2011-04-25 14:55:39 -07:00

hash-object.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

help.c

…

index-pack.c

sparse: Fix an "symbol 'cmd_index_pack' not declared" warning

2011-04-11 10:35:25 -07:00

init-db.c

i18n: mark init-db messages for translation

2011-04-12 10:46:29 -07:00

log.c

Merge branch 'cn/log-parse-opt' into next

2011-04-28 14:19:33 -07:00

ls-files.c

pathspec: rename per-item field has_wildcard to use_wildcard

2011-04-05 09:30:36 -07:00

ls-remote.c

…

ls-tree.c

pathspec: rename per-item field has_wildcard to use_wildcard

2011-04-05 09:30:36 -07:00

mailinfo.c

…

mailsplit.c

…

merge-base.c

Documentation: update to git-merge-base --octopus

2011-04-15 10:13:52 -07:00

merge-file.c

…

merge-index.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

merge-ours.c

…

merge-recursive.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

merge-tree.c

sparse: Fix an "symbol 'merge_file' not decared" warning

2011-04-11 10:35:25 -07:00

merge.c

Merge branch 'mg/merge-ff-config' into next

2011-05-08 13:35:24 -07:00

mktag.c

Merge branch 'jn/maint-c99-format'

2011-03-23 14:55:46 -07:00

mktree.c

…

mv.c

i18n: git-mv "bad" messages

2011-03-09 23:52:56 -08:00

name-rev.c

…

notes.c

Merge branch 'jk/notes-ui-updates' into next

2011-04-25 14:55:40 -07:00

pack-objects.c

Teach core.bigfilethreashold to pack-objects

2011-04-05 20:25:49 -07:00

pack-redundant.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

pack-refs.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

patch-id.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

prune-packed.c

…

prune.c

…

push.c

Merge branch 'ab/i18n-st'

2011-04-01 17:55:55 -07:00

read-tree.c

…

receive-pack.c

sparse: Fix errors and silence warnings

2011-04-03 10:14:53 -07:00

reflog.c

…

remote-ext.c

Remove unused variables

2011-03-22 11:43:27 -07:00

remote-fd.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

remote.c

Merge branch 'jk/maint-remote-mirror-safer'

2011-04-06 10:38:14 -07:00

replace.c

…

rerere.c

…

reset.c

Merge branch 'ab/i18n-st'

2011-04-01 17:55:55 -07:00

rev-list.c

rev-list --count: separate count for --cherry-mark

2011-04-26 13:13:20 -07:00

rev-parse.c

revision.c: introduce --min-parents and --max-parents options

2011-03-23 10:16:44 -07:00

revert.c

revert: Hide '-r' option in default usage

2011-04-13 11:02:49 -07:00

rm.c

i18n: git-rm basic messages

2011-03-09 23:52:56 -08:00

send-pack.c

Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into next

2011-05-05 13:55:53 -07:00

shortlog.c

sparse: Fix an "symbol 'format_subject' not declared" warning

2011-04-11 10:35:25 -07:00

show-branch.c

Share color list between graph and show-branch

2011-04-04 23:20:39 -07:00

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

Merge branch 'ab/i18n-st'

2011-04-01 17:55:55 -07:00

tar-tree.c

…

unpack-file.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

Fix sparse warnings

2011-03-22 10:16:54 -07:00

verify-pack.c

…

verify-tag.c

…

write-tree.c

…