delta/git.git/merge-recursive.h, branch va/i18n-misc-updates

merge-recursive: option to disable renames

2016-02-17T18:20:51+00:00

The recursive strategy turns on rename detection by default. Add a
strategy option to disable rename detection even for exact renames.

Signed-off-by: Felipe Gonçalves Assis 
Signed-off-by: Junio C Hamano

Move try_merge_command and checkout_fast_forward to libgit.a

2012-10-29T07:08:30+00:00

These functions are called in sequencer.c, which is part of
libgit.a. This makes libgit.a potentially require builtin/merge.c for
external git commands.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Jeff King

merge-recursive: Save D/F conflict filenames instead of unlinking them

2011-08-14T21:19:35+00:00

Rename make_room_for_directories_of_df_conflicts() to
record_df_conflict_files() to reflect the change in functionality.

Signed-off-by: Elijah Newren 
Signed-off-by: Junio C Hamano

Merge branch 'jk/merge-rename-ux'

2011-03-20T06:23:56+00:00

* jk/merge-rename-ux:
  pull: propagate --progress to merge
  merge: enable progress reporting for rename detection
  add inexact rename detection progress infrastructure
  commit: stop setting rename limit
  bump rename limit defaults (again)
  merge: improve inexact rename limit warning

merge: enable progress reporting for rename detection

2011-02-21T18:24:08+00:00

The user can enable or disable it explicitly with the new
--progress, but it defaults to checking isatty(2).

This works only with merge-recursive and subtree. In theory
we could pass a progress flag to other strategies, but none
of them support progress at this point, so let's wait until
they grow such a feature before worrying about propagating
it.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

merge: improve inexact rename limit warning

2011-02-21T18:21:26+00:00

The warning is generated deep in the diffcore code, which
means that it will come first, followed possibly by a spew
of conflicts, making it hard to see.

Instead, let's have diffcore pass back the information about
how big the rename limit would needed to have been, and then
the caller can provide a more appropriate message (and at a
more appropriate time).

No refactoring of other non-merge callers is necessary,
because nobody else was even using the warn_on_rename_limit
feature.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

cherry-pick/revert: add support for -X/--strategy-option

2010-12-28T19:27:56+00:00

For example, this would allow cherry-picking or reverting patches from
a piece of history with a different end-of-line style, like so:

	$ git revert -Xrenormalize old-problematic-commit

Currently that is possible with manual use of merge-recursive but the
cherry-pick/revert porcelain does not expose the functionality.

While at it, document the existing support for --strategy.

Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Merge branch 'kb/merge-recursive-rename-threshold'

2010-10-27T04:54:04+00:00

* kb/merge-recursive-rename-threshold:
  diff: add synonyms for -M, -C, -B
  merge-recursive: option to specify rename threshold

Conflicts:
	Documentation/diff-options.txt
	Documentation/merge-strategies.txt

Merge branch 'jf/merge-ignore-ws'

2010-10-27T04:40:54+00:00

* jf/merge-ignore-ws:
  merge-recursive: options to ignore whitespace changes
  merge-recursive --patience
  ll-merge: replace flag argument with options struct
  merge-recursive: expose merge options for builtin merge

merge-recursive: option to specify rename threshold

2010-09-29T20:15:56+00:00

The recursive merge strategy turns on rename detection but leaves the
rename threshold at the default. Add a strategy option to allow the user
to specify a rename threshold to use.

Signed-off-by: Kevin Ballard 
Signed-off-by: Junio C Hamano