git, branch v1.8.2-rc2

Git 1.8.2-rc2

2013-03-03T09:24:11Z

Signed-off-by: Junio C Hamano

Sync with 1.8.1.5

2013-03-01T21:17:18Z

Git 1.8.1.5

2013-03-01T21:15:29Z

Signed-off-by: Junio C Hamano

Make !pattern in .gitattributes non-fatal

2013-03-01T20:24:45Z

Before 82dce99 (attr: more matching optimizations from .gitignore, 2012-10-15), .gitattributes did not have any special treatment of a leading '!'. The docs, however, always said The rules how the pattern matches paths are the same as in `.gitignore` files; see linkgit:gitignore[5]. By those rules, leading '!' means pattern negation. So 82dce99 correctly determined that this kind of line makes no sense and should be disallowed. However, users who actually had a rule for files starting with a '!' are in a bad position: before 82dce99 '!' matched that literal character, so it is conceivable that users have .gitattributes with such lines in them. After 82dce99 the unescaped version was disallowed in such a way that git outright refuses to run(!) most commands in the presence of such a .gitattributes. It therefore becomes very hard to fix, let alone work with, such repositories. Let's at least allow the users to fix their repos: change the fatal error into a warning. Reported-by: mathstuf@gmail.com Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

Merge branch 'wk/user-manual' into maint

2013-03-01T18:37:40Z

* wk/user-manual: user-manual: Flesh out uncommitted changes and submodule updates user-manual: Use request-pull to generate "please pull" text user-manual: Reorganize the reroll sections, adding 'git rebase -i'

Documentation/githooks: Fix linkgit

2013-03-01T18:19:22Z

Signed-off-by: Andrew Wong Signed-off-by: Junio C Hamano

Merge branch 'maint'

2013-02-27T18:10:28Z

* maint: Update draft release notes to 1.8.1.5 Documentation/submodule: Add --force to update synopsis

Update draft release notes to 1.8.1.5

2013-02-27T18:09:59Z

Signed-off-by: Junio C Hamano

Merge branch 'ef/non-ascii-parse-options-error-diag' into maint

2013-02-27T18:04:26Z

* ef/non-ascii-parse-options-error-diag: parse-options: report uncorrupted multi-byte options

Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maint

2013-02-27T18:01:21Z

* wk/man-deny-current-branch-is-default-these-days: user-manual: typofix (ofthe->of the) user-manual: Update for receive.denyCurrentBranch=refuse