Commit 27d29edf authored by Chris Bills's avatar Chris Bills

Update README

parent 02843359
### Getting Started with GitLab ### Getting Started with GitLab
1. Generate an SSH keypair for GitLab (optional) 1. Generate an SSH keypair for GitLab (optional)
`ssh-keygen -t rsa -b 2048 -f ~/.ssh/gitlab.cels.anl.gov` * `ssh-keygen -t rsa -b 2048 -f ~/.ssh/gitlab.cels.anl.gov`
1. Add your SSH public key to your account on GitLab: 1. Add your SSH public key to your account on GitLab:
1. Browse to: https://gitlab.cels.anl.gov/profile/keys 1. Browse to: https://gitlab.cels.anl.gov/profile/keys
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
1. Click Add Key 1. Click Add Key
1. Add an entry for GitLab in your ~/.ssh/config file (Optional but very convenient) 1. Add an entry for GitLab in your ~/.ssh/config file (Optional but very convenient)
* This will allow you to type something like `git clone gitlab:namespace/project.git` without needing to pass a username, fqdn, or ssh identity to git
This will allow you to type something like `git clone gitlab:namespace/project.git` without needing to pass a username, fqdn, or ssh identity to git
``` ```
Host gitlab Host gitlab
...@@ -20,3 +19,26 @@ Host gitlab ...@@ -20,3 +19,26 @@ Host gitlab
Hostname gitlab.cels.anl.gov Hostname gitlab.cels.anl.gov
IdentityFile ~/.ssh/git.cels.anl.gov IdentityFile ~/.ssh/git.cels.anl.gov
``` ```
### bash-functions
A file that contains some example functions that can be helpful when working with git.
1. `gits [#]` - a function that displays a brief summary of changes and the previous 5 log messages and hash commits. If an optional number is provided, it will display that many log messages.
### bash-git_prompt
An example addition to the bash prompt that will show you which branch you currently have checked out, and what its status is.
#### Symbol meanings:
* `>` - Local branch is ahead of the branch it is tracking
* `<` - Local branch is behind the branch it is tracking
* `!` - Local and remote branches have diverged
* `+` - There is at least 1 local `stash`
* `?` - There are files in the git working directory that are untracked
Example:
`fool [git-tips:master?+>]$` (only imagine it in color... yeah, real helpful, I know...)
This means the local branch `master` is ahead of the remote branch it is tracking, there is at least one stash, and there are untracked files present.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment