git, branch v1.7.5-rc2

Git 1.7.5-rc2

2011-04-13T21:02:00Z

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2011-04-13T20:59:19Z

* maint:

Merge branch 'jc/rev-list-options-fix' into maint

2011-04-13T20:56:52Z

* jc/rev-list-options-fix: "log --cherry-pick" documentation regression fix

Merge branch 'js/checkout-untracked-symlink' into maint

2011-04-13T20:55:53Z

* js/checkout-untracked-symlink: t2021: mark a test as fixed

remove doubled words, e.g., s/to to/to/, and fix related typos

2011-04-13T18:59:11Z

I found that some doubled words had snuck back into projects from which I'd already removed them, so now there's a "syntax-check" makefile rule in gnulib to help prevent recurrence. Running the command below spotted a few in git, too: git ls-files | xargs perl -0777 -n \ -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt])\s+\1\b/gims)' \ -e '{$n=($` =~ tr/\n/\n/ + 1); ($v=$&)=~s/\n/\\n/g;' \ -e 'print "$ARGV:$n:$v\n"}' Signed-off-by: Jim Meyering Signed-off-by: Junio C Hamano

revert: Hide '-r' option in default usage

2011-04-13T18:02:49Z

The '-r' command-line option is a no-op provided only for backward compatiblity since abd6970 (cherry-pick: make -r the default, 2006-10-05), and somehow ended up surviving across reimplementation in C at 9509af6 (Make git-revert & git-cherry-pick a builtin, 2007-03-01) and another rewrite of the command line parser at f810379 (Make builtin-revert.c use parse_options, 2007-10-07). We should have stopped advertising the option long time ago. Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano

Merge branch 'js/checkout-untracked-symlink'

2011-04-12T07:05:50Z

* js/checkout-untracked-symlink: t2021: mark a test as fixed

Merge branch 'nd/init-gitdir'

2011-04-12T07:04:53Z

* nd/init-gitdir: t0001: guard a new test with SYMLINKS prerequisite

t2021: mark a test as fixed

2011-04-12T07:03:54Z

The failure was fixed by the previous commit. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

t0001: guard a new test with SYMLINKS prerequisite

2011-04-12T06:57:56Z

Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano