delta/git.git/Documentation, branch rs/diff-whole-function

diff: add option to show whole functions as context

2011-10-10T19:05:07+00:00

Add the option -W/--function-context to git diff.  It is similar to
the same option of git grep and expands the context of change hunks
so that the whole surrounding function is shown.  This "natural"
context can allow changes to be understood better.

Note: GNU patch doesn't like diffs generated with the new option;
it seems to expect context lines to be the same before and after
changes.  git apply doesn't complain.

This implementation has the same shortcoming as the one in grep,
namely that there is no way to explicitly find the end of a
function.  That means that a few lines of extra context are shown,
right up to the next recognized function begins.  It's already
useful in its current form, though.

The function get_func_line() in xdiff/xemit.c is extended to work
forward as well as backward to find post-context as well as
pre-context.  It returns the position of the first found matching
line.  The func_line parameter is made optional, as we don't need
it for -W.

The enhanced function is then used in xdl_emit_diff() to extend
the context as needed.  If the added context overlaps with the
next change, it is merged into the current hunk.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

Git 1.7.7

2011-09-30T21:20:57+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jc/namespace-doc-with-old-asciidoc'

2011-09-26T17:50:08+00:00

* jc/namespace-doc-with-old-asciidoc:
  Documentation/gitnamespaces.txt: cater to older asciidoc

Git 1.7.7-rc3

2011-09-23T22:35:57+00:00

Signed-off-by: Junio C Hamano

Merge 1.7.6.4 in

2011-09-23T22:31:08+00:00

Signed-off-by: Junio C Hamano

Git 1.7.6.4

2011-09-23T21:43:05+00:00

Signed-off-by: Junio C Hamano

Git 1.7.7-rc2

2011-09-18T22:41:34+00:00

Signed-off-by: Junio C Hamano

Documentation/gitnamespaces.txt: cater to older asciidoc

2011-09-16T16:20:23+00:00

Older asciidoc (e.g. 8.2.5 on Centos 5.5) is unhappy if a manpage does not
have a SYNOPSIS section. Show a sample (and a possibly bogus) command line
of running two commands that pay attention to this environment variable
with a customized value.

Signed-off-by: Junio C Hamano 
Reviewed-by: Jamey Sharp

git-svn: teach git-svn to populate svn:mergeinfo

2011-09-13T08:12:13+00:00

Allow git-svn to populate the svn:mergeinfo property automatically in
a narrow range of circumstances. Specifically, when dcommitting a
revision with multiple parents, all but (potentially) the first of
which have been committed to SVN in the same repository as the target
of the dcommit.

In this case, the merge info is the union of that given by each of the
parents, plus all changes introduced to the first parent by the other
parents.

In all other cases where a revision to be committed has multiple
parents, cause "git svn dcommit" to raise an error rather than
completing the commit and potentially losing history information in
the upstream SVN repository.

This behavior is disabled by default, and can be enabled by setting
the svn.pushmergeinfo config option.

[ew: minor style changes and manpage merge fix]

Acked-by: Eric Wong 
Signed-off-by: Bryan Jacobs

Sync with 1.7.6.3

2011-09-12T17:43:17+00:00

Signed-off-by: Junio C Hamano