User Tools

Site Tools


git

Git

Commands

Rename Branch

In my examples I'm replacing branches called 'master' with ones called 'main'.

  1. Make sure your local and remote repos are up to date.
  2. git branch -m master main to move all your stuff, including history, over to the new branch.
  3. git push -u origin main to send it to the remote
  4. Next you need to change what is set as the default. Dunno how to do this with just Git, but with Gitea (and Github) you can just do this in the web interface (settings > branches …).
  5. To delete the old branches you're not going to use anymore:
    • If you're using something like Gitea or Github:
      • You can delete the old branch from their UI, from the 'branches' tab.
      • Then use git fetch –prune to delete anything locally that's not on the remote (if that's safe in your case).
    • If you want to do it from the command line apparently:
      1. git branch -d master to delete the old local branch
      2. git push origin –delete master to delete the old remote branch
  6. Finally, we need to reset the HEAD: git remote set-head origin –auto. You can also do this in your .git directory, iirc.

.gitignore

The .gitignore file tells git which files you do not want included when you upload to your repository. For example fiels with personal info, or just things irrelevant to other people who may contribute.

They can live multiple places, so you can exlude things globably, or per-project.

Windows

It's a little bit fiddly to make dot files on windows, but you can do so from the command prompt. Either:

  • NUL> .gitignore to create a new file.
  • REN [existing file] .gitignore to rename a file you've already made.

To open a command prompt at your current location in Windows Explorer enter cmd in the location bar and hit Enter. You can jump there quickly with either F4 or Alt+D

Examples

Specific useful things to ignore

git.txt · Last modified: 2022/03/03 22:58 by rjt