diff options
Diffstat (limited to 'site/git/index.php')
| -rw-r--r-- | site/git/index.php | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/site/git/index.php b/site/git/index.php index e99dd88..d091447 100644 --- a/site/git/index.php +++ b/site/git/index.php @@ -248,17 +248,17 @@ </p> <p> <?php echo gettext("Make sure that you configured git so that your name and email address appear in the commits that you create:"); ?><br/> - $ <strong>git config --global user.name "Your Name"</strong><br/> - $ <strong>git config --global user.email your@emailaddress.com</strong><br/> + <strong>git config --global user.name "Your Name"</strong><br/> + <strong>git config --global user.email your@emailaddress.com</strong><br/> <strong>NOTE: you do not have to use your legal name; we don't care what name you use. Pseudonyms (alternative names) are OK. If you wish to be anonymous (no name), you can also use <em>Libreboot Contributor</em> as your name, and <em>noname@libreboot.org</em> as the email address. <em>We will happily accept anonymous contributions in the libreboot project.</em></strong> </p> <p> <?php echo gettext("The following is also useful:"); ?><br/> - $ <strong>git config --global core.editor nano</strong><br/> - $ <strong>git config --global color.status auto</strong><br/> - $ <strong>git config --global color.branch auto</strong><br/> - $ <strong>git config --global color.interactive auto</strong><br/> - $ <strong>git config --global color.diff auto</strong> + <strong>git config --global core.editor nano</strong><br/> + <strong>git config --global color.status auto</strong><br/> + <strong>git config --global color.branch auto</strong><br/> + <strong>git config --global color.interactive auto</strong><br/> + <strong>git config --global color.diff auto</strong> </p> <p> <strong>NOTE: the above steps for colour make git use red/green font colours for showing diffs. If you are red/green colour-blind, please ignore the above steps. The default configuration in git is no-colour (all one colour, usually the default that your terminal uses). If you are colour-blind, git can display in other colours; refer @@ -271,23 +271,23 @@ </p> <p> When working with git, you will need your current working directory to be inside the <em>libreboot</em> directory that was just created.<br/> - $ <strong>cd libreboot/</strong> + <strong>cd libreboot/</strong> </p> <p> <?php echo gettext("Once you have made your change(s), you can use this to check the status:"); ?><br/> - $ <strong>git status</strong> + <strong>git status</strong> </p> <p> <?php echo gettext("The status command will show any untracked files that you have. Add them using <strong>git add path/to/file</strong>. You should also add any other files that are listed as modified in the git status. If there are deleted files in the git status, you can use <strong>git rm path/to/file</strong>. As long as you have added all the untracked files, it is generally easier to use:"); ?><br/> - $ <strong>git commit -a</strong><br/> + <strong>git commit -a</strong><br/> <?php echo gettext("(instead of <strong>git commit</strong>)"); ?> </p> <p> <?php echo gettext("If you need to make a change to the current commit, you can do so with:"); ?><br/> - $ <strong>git commit --amend</strong><br/> + <strong>git commit --amend</strong><br/> <?php echo gettext("or:"); ?><br/> - $ <strong>git commit -a --amend</strong> + <strong>git commit -a --amend</strong> </p> <p> @@ -298,19 +298,19 @@ <p> Check once more that everything you want is added. Use the <strong>git status</strong> command to check for untracked changes/files, and adapt accordingly. Once you've committed everything, your changes will appear in a <em>diff</em> format, using this command:<br/> - $ <strong>git show</strong><br/> + <strong>git show</strong><br/> Use PgUp/PgDown to navigate the diff output. This uses the <em>less</em> utility, so all the features from that (e.g. keyword search) are also available. </p> <p> <?php echo gettext("In your local git tree, you can use this to check your commits:"); ?><br/> - $ <strong>git log</strong> + <strong>git log</strong> </p> <p> <?php echo gettext("Shortened git logs showing the short commit ID and the commit title, plus info about what branch you are on, and where all your remotes/heads are:"); ?><br/> - $ <strong>git config --global --add alias.lol "log --graph --decorate --pretty=oneline --abbrev-commit --all"</strong><br/> + <strong>git config --global --add alias.lol "log --graph --decorate --pretty=oneline --abbrev-commit --all"</strong><br/> <?php echo gettext("From then on, you can use:"); ?><br/> - $ <strong>git lol</strong><br/> + <strong>git lol</strong><br/> <?php echo gettext("This is like <strong>git log</strong>, but it's much better and shows branches, etc."); ?> </p> |