git log --graph production

Summarize changes in around 50 characters or less

More detailed explanatory text, if necessary. Wrap it to about 72
characters or so. In some contexts, the first line is treated as the
subject of the commit and the rest of the text as the body. The
blank line separating the summary from the body is critical (unless
you omit the body entirely); various tools like `log`, `shortlog`
and `rebase` can get confused if you run the two together.

Explain the problem that this commit is solving. Focus on why you
are making this change as opposed to how (the code explains that).
Are there side effects or other unintuitive consequences of this
change? Here's the place to explain them.

Further paragraphs come after blank lines.

 - Bullet points are okay, too

 - Typically a hyphen or asterisk is used for the bullet, preceded
   by a single space, with blank lines in between, but conventions
   vary here

If you use an issue tracker, put references to them at the bottom,
like this:

Resolves: #123
See also: #456, #789

git checkout master
git reset --hard origin/master
git status

git checkout A
git log --pretty=oneline # Get the hash of the commit you need
git checkout master
git cherry-pick your-hash-from-branch-a

~/.gitconfig file:

[alias]
lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
lg = !"git lg1"

Now you can use:

git lg
git lg1

git checkout -f

# Create the Patch
git diff hotfix-branch dev-branch > hotfix.patch

# Apply the Patch
git apply --stat hotfix.patch
git apply hotfix.patch

git tag
git tag -a v1.4 -m "my version 1.4"
git push origin v1.4

# Step 1 is to show what will be deleted by using the -n option:

git clean -n

# Step 2: Clean Step - beware: this will delete files:

git clean -f

# stash modified files
git stash
 
# stash modified and untracked files
git stash -u
 
# show the list of available stashes (yes, you can have multiple stashes)
git stash list
 
# apply a specific stash
git stash apply <stash-name>
 
# drop a specific stash
git stash drop <stash-name>
 
# apply and drop the last stash
git stash pop
 
# clear all stashes
git stash clear

git diff -p | \
grep -E '^(diff|old mode|new mode)' | \
sed -e 's/^old/NEW/;s/^new/old/;s/^NEW/new/' | \
git apply

git checkout master
git pull origin master
git checkout -b tu-branch

git push origin --delete tu-branch

git checkout MI-BRANCH
git rebase -i origin/master

git rebase --continue

git log --diff-filter=M --summary | grep cadena-a-ser-buscada

$ git log --all --grep='cadena-a-ser-buscada'

git fetch
git checkout master
git pull origin master
git checkout your-branch
git merge master

git checkout master-branch
git pull --rebase
git checkout your-branch
git merge master-branch --no-ff

# asegurarse estar en tu "your-branch"
git pull origin develop --rebase

1. Fetching upstream
git fetch upstream

2. Go to your master. Never develop here.
git checkout master

3. Bringing your master up to speed with latest upstream master
git merge upstream/master

4. Go to the branch you are developing
git checkout my_feature_branch

5. It will not be fast forward
git merge master

6. Solve the conflicts. Get a decent 3 views visual diff editor. I like Meld
git mergetool

7. Commit all the changes. Write an intelligible commit message
git commit -m "Decent commit message"

8. This will push the branch up on your repo.
git push origin my_feature_branch

git reflog
# you will see a list of every thing you've done in git, across all branches!
# each one has an index HEAD@{index}
# find the one before you broke everything
git reset HEAD@{index}

# make your change
git add . # or add individual files
git commit --amend
# follow prompts to change or keep the commit message
# now your last commit contains that change!

git commit --amend
# follow prompts to change the commit message

# create a new branch from the current state of master
git branch some-new-branch-name
# remove the commit from the master branch
git reset HEAD~ --hard
git checkout some-new-branch-name
# your commit lives in this branch now :)

git config credential.helper store

patch -p1 < fichero.patch

     git log

commit a49000 (commit privado)
commit 691000 (commit privado)
commit 33b000 (commit publico malo)
commit ce1000 (commit de merge bueno)
commit d33000 (commit bueno)

   git checkout -b failcommit
   git branch
   git log

   git show 
   git show HEAD~
   git show HEAD~1
   git show HEAD~2
   git show HEAD~1
   git log

   git reset --hard 691000
   git log
   git reset --hard 33b000
   git log
   git revert -m ce1000 (se hace con -m al ser un merge)
   git revert HEAD~0
   git log

   git checkout ce1000
   git branch
   git checkout failcommit 
   git checkout master 
   git status
   git reset --hard 33b000
   git log
   git revert HEAD~0
   git log
   git branch
   git pull origin master 
   git push origin master 

git push origin TU-RAMA --force-with-lease

git add your-modified-file
git commit --amend --no-edit
git push origin your-branch --force-with-lease

 git config --global core.pager cat