Search: [rebase] - Arnaud's links

Links per page: 20 50 100

page 1 / 1

6 results tagged rebase x

rebase - Squash the first two commits in Git? - Stack Overflow

git rebase -i --root master
8 novembre 2019 à 16:06:44 UTC+1 - permalink - - https://stackoverflow.com/questions/598672/squash-the-first-two-commits-in-git

git rebase
git - How to amend the last commit to un-add a file? - Super User

Pour enlever des fichiers d'un commit lors d'un rebase interactif : utiliser le keyword 'edit'
Ensuite git reset HEAD^ path/to/file/to/revert
Ensuite git commit --amend
Ensuite git rebase --continue
5 novembre 2019 à 15:31:21 UTC+1 * - permalink - - https://superuser.com/questions/229290/how-to-amend-the-last-commit-to-un-add-a-file

file git rebase remove
Note: rebase interactif en prenant tous les commits de la branche actuelle

git rebase -i $(git merge-base HEAD master)

alias grbb='git rebase -i $(git merge-base HEAD master)'
5 novembre 2019 à 10:15:56 UTC+1 - permalink - - https://links.infomee.fr/?_MBllQ

git rebase
Git push rejected after feature branch rebase - Stack Overflow

Instead of using -f or --force developers should use

--force-with-lease

Why? Because it checks the remote branch for changes which is absolutely a good idea. Let's imagine that James and Lisa are working on the same feature branch and Lisa has pushed a commit. James now rebases his local branch and is rejected when trying to push. Of course James thinks this is due to rebase and uses --force and would rewrite all Lisa's changes. If James had used --force-with-lease he would have received a warning that there are commits done by someone else. I don't see why anyone would use --force instead of --force-with-lease when pushing after a rebase.
25 janvier 2018 à 10:50:40 UTC+1 - permalink - - https://stackoverflow.com/questions/8939977/git-push-rejected-after-feature-branch-rebase

git push rebase
Undoing a git rebase - Stack Overflow

The easiest way would be to find the head commit of the branch as it was immediately before the rebase started in the reflog...

git reflog

and to reset the current branch to it (with the usual caveats about being absolutely sure before reseting with the --hard option).

Suppose the old commit was HEAD@{5} in the ref log:

git reset --hard HEAD@{5}
13 février 2017 à 12:27:23 UTC+1 - permalink - - http://stackoverflow.com/questions/134882/undoing-a-git-rebase

git rebase
Exemple git rebase
- http://symfony.com/doc/2.0/contributing/code/patches.html#step-3-submit-your-patch
- http://labs.excilys.com/2012/02/28/preparez-vous-a-reecrire-lhistoire-avec-git-rebase/
20 février 2014 à 13:22:50 UTC+1 - permalink - - http://infomee.fr/vrac/rebase.png

git rebase

Links per page: 20 50 100

page 1 / 1