Skip to content

Master#437

Closed
iko206 wants to merge 373 commits intoprogit:correction-correctionsfrom
iko206:master
Closed

Master#437
iko206 wants to merge 373 commits intoprogit:correction-correctionsfrom
iko206:master

Conversation

@iko206
Copy link

@iko206 iko206 commented Oct 25, 2015

No description provided.

schacon and others added 30 commits December 8, 2014 10:18
This is a follow-up to 3275991. All shell output that were not updated
with that commit get updated with this pull request.

Please close this if those `[source,shell]` were unchanged on purpose.
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Small grammar fix: replaced "it's" with "its"
Fixed typo: "walk through," not "walk though."
Fix a typo in "contributing" section of chapter 6
This is a subjective style change; however, in the surrounding text "we/us" is more commonly used.
Avoid first-person singular pronouns where appropriate
update shell output to console lexer
Grammar fix: setup is not a verb.
ben and others added 28 commits September 4, 2015 05:48
…mizing-git

Fix console blocks in 08-customizing.git
Bold and italic follow Asciidoc semantics
The modified `/tmp/authors` file has the last two lines swapped compared to the original file.
import-hg.asc: change order of lines
Update the explanation to match the response shown in the console block.
transfer-protocols.asc: Update the git-receive-pack response explanation
"git clone" does not say "Initialized empty Git repository" (it may have
done so in very old versions), but "cloning into '$repo'". Reflect this
in the examples.

Noticed by Tim Castelijns:
http://stackoverflow.com/questions/32580578/why-the-git-commit-am-command-is-working-with-untraked-file-in-the-documenta
Fix example output of "git clone"
took me a few trial and errors to figure out what 'named appropriately' meant -- this would clear it up

also, you had the proper name of Git rather than the .git subdirectory
* Remove multiple "after the fact"
* "merge conflict" -> "resolve conflict
Optimize the size of PNG images by running the following two commands:

```
find . -name *.png -exec pngquant -f --skip-if-larger {} -o {} \;
find . -name *.png -exec optipng -o5 {} \;
```

These two commands save about 8.9M (64%). Evaluate the size with

```
find . -name *.png -print0 | xargs -0 du -csh
```

References:

* pngquant: https://pngquant.org
* optipng: http://optipng.sourceforge.net
Compilation on Centos 6 requires perl-devel and docbook2X (uppercase X). I'm assuming this is the same for all other RHEL-likes.

docbook2X is only available through third-party repo like EPEL. Additionally, the binary is named `db2x_docbook2texi` instead of `docbook2x-texi` so symlinking is required.
Updated installing.asc for Centos/Fedora
On a Windows system, even though you have setup Notepad++ as default
system editor, Git seems to behave oddly during operations and you may trip over
glitches, like prematurely terminated Git operations before your edits
are complete.
Setting up core.editor in Git explicitly to Notepad++ fixes this behaviour.
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Give more details on Windows system-level config file.
[core.editor] improve first time setup to include Notepad++
User files generated with htdigest and htpasswd are not compatible.
Thus, htpasswd must be used with AuthType Basic.

Signed-off-by: Vitaly Kuznetsov <vitalyq@users.noreply.github.com>
Apache process doesn’t have write permissions for the /opt/git/
subdirectories. Restore the paragraph from this section:
https://git-scm.com/book/en/v1/Git-on-the-Server-Public-Access.

Signed-off-by: Vitaly Kuznetsov <vitalyq@users.noreply.github.com>
There is an issue with the authentication section. The initial ref
advertisement request will fail without even giving an opportunity for
authentication. This is described in the git-http-backend man page
examples.

Update authentication section according to the example to fix the problem.
Merge the section with the git-core access authorization section for
brevity.

Signed-off-by: Vitaly Kuznetsov <vitalyq@users.noreply.github.com>
I can't seem to find any information on using 'winstore' as a credential saving option on Windows. The link is outdated. 

With the default Git for Windows 2.6.1, when I run `git help -a` like the docs tell you to, it shows "crendential-wincred". 
https://git-scm.com/docs/gitcredentials

GitHub recommends to use "wincred" as well:
https://help.github.com/articles/caching-your-github-password-in-git/
change 'winstore' credential option to 'wincred'
@ben
Copy link
Member

ben commented Oct 25, 2015

This seems mistargeted. Can you please either resubmit with the right base or tell me what your intention is?

@ben ben closed this Oct 25, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Comments