delta/git.git/contrib/examples/git-merge.sh, branch ss/userdiff-update-csharp-java

git-merge.sh: use the $( ... ) construct for command substitution

2014-04-17T18:14:59+00:00

The Git CodingGuidelines prefer the $(...) construct for command
substitution instead of using the backquotes `...`.

The backquoted form is the traditional method for command
substitution, and is supported by POSIX.  However, all but the
simplest uses become complicated quickly.  In particular, embedded
command substitutions and/or the use of double quotes require
careful escaping with the backslash character.

The patch was generated by:

for _f in $(find . -name "*.sh")
do
   sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
done

and then carefully proof-read.

Signed-off-by: Elia Pinto 
Reviewed-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

use 'commit-ish' instead of 'committish'

2013-09-04T22:03:03+00:00

Replace 'committish' in documentation and comments with 'commit-ish'
to match gitglossary(7) and to be consistent with 'tree-ish'.

The only remaining instances of 'committish' are:
  * variable, function, and macro names
  * "(also committish)" in the definition of commit-ish in
    gitglossary[7]

Signed-off-by: Richard Hansen 
Signed-off-by: Junio C Hamano

merge script: learn --[no-]rerere-autoupdate

2010-08-18T21:02:05+00:00

Port v1.7.0-rc0~83^2 (Teach --[no-]rerere-autoupdate option to
merge, revert and friends, 2009-12-04) to the example merge script.

After this change, all tests pass for me with the scripted
merge.

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

merge script: notice @{-1} shorthand

2010-08-18T21:02:05+00:00

Port v1.6.2-rc1~10^2 (Teach @{-1} to git merge, 2009-02-13) to
the old merge script.

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

merge script: handle --no-ff --no-commit correctly

2010-08-18T21:02:05+00:00

In a --no-ff merge with conflicts, "git commit" used to forget the
--no-ff when used to complete the merge.  That was fixed by
v1.6.1-rc1~134^2 (builtin-commit: use reduce_heads() only when
appropriate, 2008-10-03) for the builtin merge.  Port the change to
the merge script in contrib/examples.

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

merge script: --ff-only to disallow true merge

2010-08-18T21:02:05+00:00

Port v1.6.6-rc0~62^2 (Teach 'git merge' and 'git pull' the option
--ff-only, 2009-10-29) to the old merge script.

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

merge script: handle many-way octopus

2010-08-18T21:02:05+00:00

Based on v1.6.0-rc0~51^2~5 (Build in merge, 2008-07-07).

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

merge script: handle -m --log correctly

2010-08-18T21:02:05+00:00

Based on v1.7.1.1~23^2 (merge: --log appends shortlog to message if
specified, 2010-05-11).  Without this change, the scripted
(non-builtin) merge does not pass t7604.

Cc: Tay Ray Chuan 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

merge script: forbid merge -s index

2010-08-18T21:02:04+00:00

Some git-merge-* commands are not merge strategies.  This is based on
v1.6.1-rc1~294^2~7 (builtin-merge: allow using a custom strategy,
2008-07-30) but it is less smart: we just use a hard-coded list of
forbidden strategy names.  It is okay if this falls out of date, since
the code is just an example.

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

merge script: allow custom strategies

2010-08-18T21:02:04+00:00

The idea comes from v1.6.1-rc1~294^2~7 (builtin-merge: allow using a
custom strategy, 2008-07-30).

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