Git tips & tricks: Fixup last commit

We will use `$ git commit --amend` here in different ways... ### Fixup last commit whithout changing comment: ```Git $ git commit -m 'initial commit' # added forgotten_config_file # Do this: $ git commit -a --amend --no-edit U'll get only one commit with unchanged commit message and last changes ammended ```

Chasing the Trunk Based Development

A source-control branching model, where developers collaborate on code in a single branch called trunk, resist any pressure to create other long-lived development branches by employing documented techniques. They therefore avoid merge hell, do not break the build, and live happily ever after..

Release branch is typically a snapshot from trunk with an optional number of cherry picks that are developed on trunk and then pulled into the branch.

Git tips & tricks: Merge vs Rebase (When to use?)

Keeping a clean history and smooth git workflow comes down to knowing the base use-cases & rules.

Rebases are how changes should pass from the top of hierarchy downwards and merges are how they flow back upwards.

---

• Use git pull --rebase when pulling changes from origin.
• Use git merge when merging feature branch changes back to master.

Rebasing Deletes Merge Commits! Never rebase master onto your feature branch!
see also –preserve-merges flag.

---

Using merge when pulling changes from origin ties two histories together creating interleaved messy thread of histories:

• Interleaved history during merge: their feature X, my feature Y, their feature X, my feature Y...
• Linear history during rebase: their feature X, their feature X, my feature Y, my feature Y...

Git Tips & Tricks: Case-sensitive Only filename changes

## What is the problem with it? If a directory listing finds `Foobar` file when git expects `FooBar`, git will assume it's really the same file, and continue to remember it as `Foobar`. ## Two Steps approach Renaming `Foobar` into `FooBar`:

Git Tips & Tricks: Make the current commit the only (initial) commit

Here is the brute-force approach, which also removes the configuration of the repository.

Git Tips & Tricks: Change Git Comments (Git Commit message)

## Change Last Commit message To open text editor, allowing you to edit the commit message of the most recent commit: git commit --amend To set the latest commit message directly in the command line: git commit --amend -m "New message of commit" ---- ## Change the Old Commit message If you want to fix the not recent commit or to edit the whole git history use `rebase -interactive`:

Git tips & trics: Tagging

## Create Tags ### See the existing tags list: $ git tag v3.5 v4.0 ### Add annotated tag Use `$ git tag -a` to make an annotated tag. *Note: It's recommended to create annotated tag to keep all information like the tagger name, email, and date; have a tagging message.* $ git tag -a v3.5 -m 'release version 3.5' U can also tag some of the old commits: $ git tag -a v3.0 1fceb03

Git Tracking remote branches

Why i need to track some remote branch?

First af all, It's nessesary for git system to know where to push/pull the changes from your local branch. Whatever, u can explicity define where u want to push your changes via using the $ git push <remote-name> <branch-name>. But let's ssume that u're a bit lazy and won't to type your remote branch name extra times when u're working in the same branch all the time. So Let's try it:

Git tips & trics

Skipping the staging Area

use $ git commit -a -m 'added some ASDoc comment' to stage every already tracked file automatically before doing commit and make commit with the comment and with skip git add part.

Git Book ref 

Stage all files at once

To stage all files from current folder at once use $ git add .
Using "." it's the shortnes way to add the  current folder and all subfolders of it.
But don't forget to do git status before it, to prevent adding of some unexpected files!

How to quit from Vim without the window closing :)

When u called $ git commit without -t , the Vim will be opened by default to add comment message to your commit.
So, enter the comment message, press Esc tnen :wq to write comment, quit from Vim and finish the commit or Esc then :q to just quit.

How to output content of the file into console.

Use $ cat some_file , to fully output file content into console.