recentpopularlog in

kme : whenthingsgowrong   8

The Thing About Git [http://tomayko.com/]
And then there's git rebase --interactive, which is a bit like git commit --amend hopped up on acid and holding a chainsaw - completely insane and quite dangerous but capable of exposing entirely new states of mind. Here you can edit, squash, reorder, tease apart, and annotate existing commits in a way that's easier and more intuitive than it ought to be. The "INTERACTIVE MODE" section of the git-rebase(1) manual page is instructive but Pierre Habouzit's demonstration is what flipped the light on for me.
git  versioncontrol  devel  scm  article  svn  whenthingsgowrong 
october 2014 by kme
Jessica Kerr "Git Happens" - YouTube
So, 'git rebase -i' allows you to "pick" some commits to have their own commit in the origin's history (possibly out of order) and choose to "squash" other commits (like when I do 'checkpoint' commits, or Jessica's example of 'Going to lunch') so that they don't clutter up the origin repository's history.
git  gitrebase  conference  talk  video  whenthingsgowrong  explained  epiphany 
september 2014 by kme
version control - Aborting a merge in Git - Stack Overflow [http://stackoverflow.com/]
Since your pull was unsuccessful then just HEAD is the last "valid" commit on your branch (not HEAD^):

git reset --hard HEAD
git  whenthingsgowrong  merge  abortabort  solution 
july 2014 by kme

Copy this bookmark:





to read