diff options
| author | tekkub <tekkub@gmail.com> | 2009-11-27 16:09:11 -0700 |
|---|---|---|
| committer | tekkub <tekkub@gmail.com> | 2009-11-27 16:09:11 -0700 |
| commit | c38b925777a250d6cc7015b2128b701abcb7a27e (patch) | |
| tree | 335bd243140a87490b1520f9dde5393758b57f93 | |
| parent | 996d753d0c0242b0b6fb346683a8351d9b46c57b (diff) | |
| parent | 00f4345523917716a49f946d807d62e3f0966e06 (diff) | |
Merge branch 'master' of git://github.com/joachim-n/help.github.com
| -rw-r--r-- | _posts/2009-06-17-troubleshooting-ssh.textile | 2 | ||||
| -rw-r--r-- | _posts/2009-09-03-working-with-key-passphrases.textile | 2 | ||||
| -rw-r--r-- | _posts/2009-10-10-subtree-merge.textile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/_posts/2009-06-17-troubleshooting-ssh.textile b/_posts/2009-06-17-troubleshooting-ssh.textile index c355a8d..be33dd0 100644 --- a/_posts/2009-06-17-troubleshooting-ssh.textile +++ b/_posts/2009-06-17-troubleshooting-ssh.textile @@ -65,7 +65,7 @@ This explicitly provides the key for plink to use, rather than have it talk with This problem occured for me when I used the executable with pageant that came with WinSCP, but a version of plink in a different directory. I have not found the exact cause yet. All versions were plink/pageant 0.60. (Not running under Cygwin) -p(. I did not have luck with this approach; GIT_SSH was set to plink.exe already; when I tried to create this script and reset the GIT_SSH I got a "could not fork" error back from git even though the script would run happily on it's own - elijahsmith 9/11/08 +p(. I did not have luck with this approach; GIT_SSH was set to plink.exe already; when I tried to create this script and reset the GIT_SSH I got a "could not fork" error back from git even though the script would run happily on its own - elijahsmith 9/11/08 p(. I couldn't get the latest versions of plink and pageant (as of 2008-Nov-15) to talk, and I'm not running Cygwin. The only solution was to revert to using open-ssh by setting @GIT_SSH@ to @C:\Program Files\prg\Git\bin\ssh.exe@. -- "dandv":http://github.com/dandv diff --git a/_posts/2009-09-03-working-with-key-passphrases.textile b/_posts/2009-09-03-working-with-key-passphrases.textile index 07c6aa3..e48f6aa 100644 --- a/_posts/2009-09-03-working-with-key-passphrases.textile +++ b/_posts/2009-09-03-working-with-key-passphrases.textile @@ -72,7 +72,7 @@ Run 'git help git' to display the help index. Run 'git help <command>' to display help for specific commands. [Tekkub@KAKU: ~ master]$</pre> -The process will continue to run until you log out, shutdown or kill ssh-agent. To kill the process, find it's PID with @ps@ then call @kill <PID>@: +The process will continue to run until you log out, shutdown or kill ssh-agent. To kill the process, find its PID with @ps@ then call @kill <PID>@: <pre class="terminal">[Tekkub@KAKU: ~ master]$ ps PID PPID PGID WINPID TTY UID STIME COMMAND diff --git a/_posts/2009-10-10-subtree-merge.textile b/_posts/2009-10-10-subtree-merge.textile index cd50b06..ab4fddc 100644 --- a/_posts/2009-10-10-subtree-merge.textile +++ b/_posts/2009-10-10-subtree-merge.textile @@ -65,7 +65,7 @@ Automatic merge went well; stopped before committing as requested h2. Pulling in changes -If the merged repo changes in the future, you can pull in it's changes by simply using the @-s subtree@ flag: +If the merged repo changes in the future, you can pull in its changes by simply using the @-s subtree@ flag: <pre class="terminal">[tekkub@tekBook: ~/tmp/test master] $ git pull -s subtree panda master</pre> |