git/contrib/examples/git-resolve.sh, branch v2.8.2

contrib/examples/git-resolve.sh: avoid "test -a/-o "

2014-06-09T21:47:06Z

The construct is error-prone; "test" being built-in in most modern shells, the reason to avoid "test && test " spawning one extra process by using a single "test -a " no longer exists. Signed-off-by: Elia Pinto Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano

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

2014-04-17T18:15:00Z

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 'fast-forward' all over the place

2009-10-25T06:50:28Z

It's a compound word. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

Rewrite "git-frotz" to "git frotz"

2007-07-03T05:52:14Z

This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano

Remove git-resolve.

2007-02-13T03:33:03Z

Signed-off-by: Junio C Hamano