VirtualTam's bookmarks

1. git - push --force-with-lease by default - Stack Overflow 2019-10-14

   tags: rebase, source-code-management, source-code-management/git

   [ permalink ]
2. How to make Git pull use rebase by default for all my repositories? - Stack Overflow 2019-10-14

   tags: rebase, source-code-management, source-code-management/git

   [ permalink ]
3. Git autostash 2018-07-24

   tags: rebase, source-code-management/git, stash

   [ permalink ]

   • https://stackoverflow.com/questions/30208928/can-git-pull-automatically-stash-and-pop-pending-changes
   • https://stackoverflow.com/questions/37252108/how-do-i-apply-autostash-after-an-aborted-rebase
4. Git - Merge and/or Rebase workflows 2017-10-26

   tags: branch, merge, rebase, source-code-management, source-code-management/git

   [ permalink ]

   • https://www.atlassian.com/git/tutorials/merging-vs-rebasing
   • https://stackoverflow.com/questions/804115/when-do-you-use-git-rebase-instead-of-git-merge
   • https://medium.com/bekk/why-you-should-stop-using-git-rebase-5552bee4fed1
   • https://medium.com/@porteneuve/getting-solid-at-git-rebase-vs-merge-4fa1a48c53aa
5. Fix conflicts only once with git rerere 2015-06-11

   tags: conflict, diff, merge, rebase, source-code-management/git

   [ permalink ]

   Original article: http://www.git-attitude.fr/2014/11/04/git-rerere/ Official doc: http://git-scm.com/docs/git-rerere

6. Notre workflow git, pourquoi, comment 2014-12-02

   tags: branch, continuous-integration, development, source-code-management/git, workflow

   [ permalink ]

   via http://linuxfr.org/users/crev/journaux/git-workflow-rebase-conflits-et-role-d-integrateur