Databases
StackOverflow2013
Postsdbo
POusing git rebase -i
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POusing git rebase -i
    text
    copied!<p>so I'm trying to split commits using the instructions in <a href="http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html" rel="nofollow">http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html</a></p> <p>try searching for "SPLITTING COMMITS"</p> <p>there it says to "Mark the commit you want to split with the action "edit". "</p> <p>how exactly do I do that</p> <p>when I execute git rebase -i it opens a file</p> <pre><code># Commands: # p, pick = use commit # r, reword = use commit, but edit the commit message # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but discard this commit's log message # x, exec = run command (the rest of the line) using shell # # These lines can be re-ordered; they are executed from top to bottom. # # If you remove a line here THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted. # # Note that empty commits are commented out ... </code></pre> <p>how exactly do I execute those commands from that dialog</p> <p><strong>EDIT</strong></p> <p>So I managed to rebase successfully and committed to my local repo...</p> <p>The problem is, when I try to push I get the error message:</p> <pre><code> ! [rejected] JJ-4322 -&gt; JJ-4322 (non-fast-forward) ! [rejected] master -&gt; master (non-fast-forward) error: failed to push some refs to 'url.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. </code></pre> <p>any ideas?</p>
 

Querying!

 
Guidance
An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload