Junio C Hamano 50909c1f07 Merge branch 'cc/revert-strategy' into next ...

* cc/revert-strategy:
  revert: add "--strategy" option to choose merge strategy
  merge: make function try_merge_command non static
  merge: refactor code that calls "git merge-STRATEGY"
  revert: refactor merge recursive code into its own function
  revert: use strbuf to refactor the code that writes the merge message

Conflicts:
	builtin/revert.c

2010-04-05 00:11:34 -07:00

..

add.c

Revert "Merge branch 'jc/maint-add-ignored-dir' into next"

2010-03-13 23:24:00 -08:00

annotate.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

apply.c

Introduce remove_or_warn function

2010-03-28 09:53:04 -07:00

archive.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

bisect--helper.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

blame.c

Merge branch 'maint'

2010-03-13 21:31:42 -08:00

branch.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

bundle.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

cat-file.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

check-attr.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

check-ref-format.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

checkout-index.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

checkout.c

Merge branch 'em/checkout-orphan' into next

2010-03-28 21:59:51 -07:00

clean.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

clone.c

Merge branch 'tc/transport-verbosity'

2010-03-15 00:58:42 -07:00

commit-tree.c

make commit_tree a library function

2010-04-01 23:53:54 -07:00

commit.c

builtin/commit: remove unnecessary variable definition

2010-04-02 11:38:00 -07:00

config.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

count-objects.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

describe.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

diff-files.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

diff-index.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

diff-tree.c

Merge branch 'pb/log-first-parent-p-m'

2010-03-24 16:25:39 -07:00

diff.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

fast-export.c

Merge branch 'maint'

2010-03-28 17:42:58 -07:00

fetch-pack.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

fetch.c

Merge branch 'maint'

2010-03-20 11:29:19 -07:00

fmt-merge-msg.c

fmt-merge-msg: hide summary option

2010-03-24 19:45:31 -07:00

for-each-ref.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

fsck.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

gc.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

grep.c

Merge branch 'rs/threaded-grep-context' into next

2010-03-28 21:59:50 -07:00

hash-object.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

help.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

index-pack.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

init-db.c

Merge branch 'sd/init-template'

2010-03-10 15:32:43 -08:00

log.c

Merge branch 'master' into next

2010-03-29 21:29:32 -07:00

ls-files.c

ls: remove redundant logic

2010-03-21 16:23:44 -07:00

ls-remote.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

ls-tree.c

ls: remove redundant logic

2010-03-21 16:23:44 -07:00

mailinfo.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

mailsplit.c

Merge branch 'sh/am-keep-cr'

2010-03-10 15:32:34 -08:00

merge-base.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge-file.c

merge-file --diff3: add a label for ancestor

2010-03-20 20:36:11 -07:00

merge-index.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge-ours.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge-recursive.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge.c

Merge branch 'cc/revert-strategy' into next

2010-04-05 00:11:34 -07:00

mktag.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

mktree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

mv.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

name-rev.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

notes.c

Merge branch 'sb/notes-parse-opt'

2010-03-28 21:52:28 -07:00

pack-objects.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

pack-redundant.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

pack-refs.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

patch-id.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

prune-packed.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

prune.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

push.c

Merge branch 'tc/transport-verbosity'

2010-03-15 00:58:42 -07:00

read-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

receive-pack.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

reflog.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

remote.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

replace.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

rerere.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

reset.c

Sync with 1.7.0.4

2010-03-31 15:14:27 -07:00

rev-list.c

Merge branch 'mg/use-default-abbrev-length-in-rev-list' into next

2010-03-28 21:59:52 -07:00

rev-parse.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

revert.c

Merge branch 'cc/revert-strategy' into next

2010-04-05 00:11:34 -07:00

rm.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

send-pack.c

Merge branch 'ld/push-porcelain'

2010-03-15 00:58:24 -07:00

shortlog.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

show-branch.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

show-ref.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

stripspace.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

symbolic-ref.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

tag.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

tar-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

unpack-file.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

unpack-objects.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

update-index.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

update-ref.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

update-server-info.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

upload-archive.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

var.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

verify-pack.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

verify-tag.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

write-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00