git, branch v1.7.3.2

Git 1.7.3.2

2010-10-22T00:14:32Z

Merge branch 'sn/doc-opt-notation' into maint

2010-10-21T23:26:42Z

* sn/doc-opt-notation: Fix {update,checkout}-index usage strings Put a space between `<' and argument in pack-objects usage string Remove stray quotes in --pretty and --format documentation Use parentheses and `...' where appropriate Fix odd markup in --diff-filter documentation Use angles for placeholders consistently

Merge branch 'mg/fix-build-remote-helpers' into maint

2010-10-21T23:26:38Z

* mg/fix-build-remote-helpers: remote-helpers: build in platform independent directory

t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'

2010-10-19T21:15:30Z

Signed-off-by: Antonio Ospite Signed-off-by: Junio C Hamano

Clarify and extend the "git diff" format documentation

2010-10-19T21:15:30Z

Move the similarity and dissimilarity index header description closer to where those extended headers are described. Describe and/or clarify the format used for file modes, pathnames, and the index header. Document that all "old" files refer to the state before applying the *entire* output, and all "new" files refer to the state thereafter. Signed-off-by: Andreas Gruenbacher Signed-off-by: Junio C Hamano

git-show-ref.txt: clarify the pattern matching

2010-10-19T21:15:30Z

git-show-ref really does not do what one would expect under the name pattern matching, so describe it. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

documentation: git-config minor cleanups

2010-10-19T21:15:30Z

Change push.default's description to add hyphens between values and descriptions to make the manpage easier to read. The html version is readable either way. Change status.showUntrackedFiles to make item descriptions be sentences and to use the same asciidoc format as push.default. The only visual change is the additions of "." Signed-off-by: Cliff Frey Acked-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Update test script annotate-tests.sh to handle missing/extra authors

2010-10-19T21:15:30Z

The current script used by annotate-tests.sh (used by t8001 and t8002) fails to emit a warning if any of the expected authors never show up in the output or if authors that show up in the output were never specified as expected. Update the script to fail in both of these scenarios. Helped-by: Jakub Narebski Signed-off-by: Kevin Ballard Signed-off-by: Junio C Hamano

Better advice on using topic branches for kernel development

2010-10-14T02:10:56Z

Linus Torvalds wrote: > The real problem is that maintainers often pick random - and not at > all stable - points for their development to begin with. They just > pick some random "this is where Linus -git tree is today", and do > their development on top of that. THAT is the problem - they are > unaware that there's some nasty bug in that version. Maybe they do this because they read it in the Git user-manual. Fix the manual to give them better guidance. Signed-off-by: Tony Luck Signed-off-by: Junio C Hamano

Documentation: update implicit "--no-index" behavior in "git diff"

2010-10-14T02:10:56Z

Originally "--no-index" mode triggered for untracked files within the tracked tree, but with v1.5.6-rc1~41 (Merge branch 'jc/diff-no-no-index, 2008-05-26) the command was fixed to only implicitly trigger when paths outside the tracked tree are mentioned. Reported-by: Yann Dirson Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano