delta/git.git, branch tr/userdiff-c-returns-pointer

userdiff: allow * between cpp funcname words

2011-12-06T21:16:37+00:00

The cpp pattern, used for C and C++, would not match the start of a
declaration such as

  static char *prepare_index(int argc,

because it did not allow for * anywhere between the various words that
constitute the modifiers, type and function name.  Fix it.

Signed-off-by: Thomas Rast 
Signed-off-by: Junio C Hamano

Git 1.7.3

2010-09-18T21:55:08+00:00

Signed-off-by: Junio C Hamano

Merge branch 'js/ls-files-x-doc'

2010-09-18T21:46:44+00:00

* js/ls-files-x-doc:
  ls-files documentation: reword for consistency
  git-ls-files.txt: clarify -x/--exclude option

Conflicts:
	Documentation/git-ls-files.txt

git-rebase--interactive.sh: replace cut with ${v%% *}

2010-09-17T21:58:08+00:00

Some versions of cut do not cope well with lines that do not end in
an LF. In this case, we can completely avoid cut by using the
${var%% *} parameter expansion (suggested by Brandon Casey).

I found this problem when t3404's "avoid unnecessary reset" failed
due to the "rebase -i" not avoiding updating the tested timestamp.

On a Mac OS X 10.4.11 system:

    % printf '%s' 'foo bar' | /usr/bin/cut -d ' ' -f 1
    cut: stdin: Illegal byte sequence

Signed-off-by: Chris Johnsen 
Signed-off-by: Junio C Hamano

t/t7300: workaround ancient touch by rearranging arguments

2010-09-17T21:42:13+00:00

The ancient touch on Solaris 7 thinks that a decimal number supplied as
the first argument specifies a date_time to give to the files specified by
the remaining arguments.  In this case, it fails to parse '1' as a proper
date_time and exits with a failure status.  Workaround this flaw by
rearranging the arguments supplied to touch so that a non-digit appears
first and touch will not be confused.

Signed-off-by: Brandon Casey 
Signed-off-by: Junio C Hamano

Merge branch 'bg/fix-t7003'

2010-09-16T14:43:41+00:00

* bg/fix-t7003:
  t7003: Use test_commit instead of custom function

ls-files documentation: reword for consistency

2010-09-16T00:38:50+00:00

Similar to descriptions of other options, state what -x does in imperative
mood.  Start sentences for -X and --exclude-per-directory options in
capital letters.

Signed-off-by: Junio C Hamano

git-ls-files.txt: clarify -x/--exclude option

2010-09-16T00:30:36+00:00

Since b5227d8, -x/--exclude does not apply to cached files.
This is easy to miss unless you read the discussion in the
EXCLUDE PATTERNS section. Clarify that the option applies
to untracked files and direct the reader to EXCLUDE PATTERNS.

Signed-off-by: Jay Soffian 
Signed-off-by: Junio C Hamano

Git 1.7.3 rc2

2010-09-15T19:47:37+00:00

Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'

2010-09-15T19:41:13+00:00

* dr/maint-ls-tree-prefix-recursion-fix:
  ls-tree $di $dir: do not mistakenly recurse into directories