Skip to content

Commit ddc4073

Browse files
committed
Add empty lines accordingly common format
1 parent 32fd9ba commit ddc4073

File tree

3 files changed

+27
-9
lines changed

3 files changed

+27
-9
lines changed

book/09-git-and-other-scms/sections/client-bzr.asc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Nevertheless, it is possible to work on a Bazaar repository from a Git one.
1010
There are many projects that allow you to use Git as a Bazaar client.
1111
Here we'll use Felipe Contreras' project that you may find at https://github.com/felipec/git-remote-bzr[].
1212
To install it, you just have to download the file git-remote-bzr in a folder contained in your `$PATH`:
13+
1314
[source,console]
1415
----
1516
$ wget https://raw.github.com/felipec/git-remote-bzr/master/git-remote-bzr -O ~/bin/git-remote-bzr
@@ -24,10 +25,11 @@ That's all!
2425
It is simple to use.
2526
It is enough to clone a Bazaar repository prefixing it by `bzr::`.
2627
Since Git and Bazaar both do full clones to your machine, it's possible to attach a Git clone to your local Bazaar clone, but it isn't recommended.
27-
It's much easier to attach your Git clone directly to the same place your Bazaar clone is attached to the central repository.
28+
It's much easier to attach your Git clone directly to the same place your Bazaar clone is attached to -- the central repository.
2829

2930
Let's suppose that you worked with a remote repository which is at address `bzr+ssh://developer@mybazaarserver:myproject`.
3031
Then you must clone it in the following way:
32+
3133
[source,console]
3234
----
3335
$ git clone bzr::bzr+ssh://developer@mybazaarserver:myproject myProject-Git
@@ -36,6 +38,7 @@ $ cd myProject-Git
3638

3739
At this point, your Git repository is created but it is not compacted for optimal disk use.
3840
That's why you should also clean and compact your Git repository, especially if it is a big one:
41+
3942
[source,console]
4043
----
4144
$ git gc --aggressive
@@ -45,18 +48,21 @@ $ git gc --aggressive
4548

4649
Bazaar only allows you to clone branches, but a repository may contain several branches, and `git-remote-bzr` can clone both.
4750
For example, to clone a branch:
51+
4852
[source,console]
4953
----
5054
$ git clone bzr::bzr://bzr.savannah.gnu.org/emacs/trunk emacs-trunk
5155
----
5256

5357
And to clone the whole repository:
58+
5459
[source,console]
5560
----
5661
$ git clone bzr::bzr://bzr.savannah.gnu.org/emacs emacs
5762
----
5863

5964
The second command clones all the branches contained in the emacs repository; nevertheless, it is possible to point out some branches:
65+
6066
[source,console]
6167
----
6268
$ git config remote-bzr.branches 'trunk, xwindow'
@@ -99,6 +105,7 @@ However, be careful with its creation because with Git it is impossible to re-in
99105

100106
To fetch the changes of the remote, you pull changes as usually, using Git commands.
101107
Supposing that your changes are on the `master` branch, you merge or rebase your work on the `origin/master` branch:
108+
102109
[source,console]
103110
----
104111
$ git pull --rebase origin
@@ -110,6 +117,7 @@ Because Bazaar also has the concept of merge commits, there will be no problem i
110117
So you can work on a branch, merge the changes into `master` and push your work.
111118
Then, you create your branches, you test and commit your work as usual.
112119
You finally push your work to the Bazaar repository:
120+
113121
[source,console]
114122
----
115123
$ git push origin master

book/09-git-and-other-scms/sections/import-bzr.asc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Traceback (most recent call last):
5252
ImportError: No module named fastimport
5353
$ pip install fastimport
5454
----
55+
5556
If it is not available, you can download it at address https://pypi.python.org/pypi/fastimport/.
5657

5758
In the second case (on Windows), `bzr-fastimport` is automatically installed with the standalone version and the default installation (let all the checkboxes checked).

book/A-git-in-other-environments/sections/powershell.asc

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ It looks like this:
1212
image::images/posh-git.png[PowerShell with Posh-git.]
1313

1414
==== Installation
15+
1516
===== Prerequisites (Windows only)
17+
1618
Before you're able to run PowerShell scripts on your machine, you need to set your local ExecutionPolicy to RemoteSigned (Basically anything except Undefined and Restricted).
1719
If you choose AllSigned instead of RemoteSigned, also local scripts (your own) need to be digitally signed in order to be executed.
1820
With RemoteSigned, only Scripts having the "ZoneIdentifier" set to Internet (were downloaded from the web) need to be signed, others not.
@@ -24,19 +26,22 @@ More about PowerShell Scopes: https://docs.microsoft.com/en-us/powershell/module
2426
More about PowerShell ExecutionPolicy: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy[]
2527

2628
[source,powershell]
27-
-----
29+
----
2830
> Set-ExecutionPolicy -Scope LocalMachine -ExecutionPolicy RemoteSigned -Force
29-
-----
31+
----
3032

3133
===== PowerShell Gallery
34+
3235
If you have at least PowerShell 5 or PowerShell 4 with PackageManagement installed, you can use the package manager to install posh-git for you.
3336

3437
More information about PowerShell Gallery: https://docs.microsoft.com/en-us/powershell/scripting/gallery/overview[]
38+
3539
[source,powershell]
36-
-----
40+
----
3741
> Install-Module posh-git -Scope CurrentUser -Force
3842
> Install-Module posh-git -Scope CurrentUser -AllowPrerelease -Force # Newer beta version with PowerShell Core support
39-
-----
43+
----
44+
4045
If you want to install posh-git for all users, use "-Scope AllUsers" instead and execute the command from an elevated PowerShell console.
4146
If the second command fails with an error like `Module 'PowerShellGet' was not installed by using Install-Module`, you'll need to run another command first:
4247

@@ -49,25 +54,29 @@ Then you can go back and try again.
4954
This happens, because the modules that ship with Windows PowerShell are signed with a different publishment certificate.
5055

5156
===== Update PowerShell Prompt
57+
5258
To include git information in your prompt, the posh-git module needs to be imported.
5359
To have posh-git imported every time PowerShell starts, execute the Add-PoshGitToProfile command which will add the import statement into you $profile script.
5460
This script is executed everytime you open a new PowerShell console.
5561
Keep in mind, that there are multiple $profile scripts.
5662
E. g. one for the console and a separate one for the ISE.
63+
5764
[source,powershell]
58-
-----
65+
----
5966
> Import-Module posh-git
6067
> Add-PoshGitToProfile -AllHosts
61-
-----
68+
----
6269

6370
===== From Source
71+
6472
Just download a posh-git release from (https://github.com/dahlbyk/posh-git[]), and uncompress it.
6573
Then import the module using the full path to the posh-git.psd1 file:
74+
6675
[source,powershell]
67-
-----
76+
----
6877
> Import-Module <path-to-uncompress-folder>\src\posh-git.psd1
6978
> Add-PoshGitToProfile -AllHosts
70-
-----
79+
----
7180

7281
This will add the proper line to your `profile.ps1` file, and posh-git will be active the next time you open PowerShell.
7382
For a description of the Git status summary information displayed in the prompt see: https://github.com/dahlbyk/posh-git/blob/master/README.md#git-status-summary-information[]

0 commit comments

Comments
 (0)