Changes between Version 22 and Version 23 of WorkingWithGit


Ignore:
Timestamp:
Aug 21, 2016, 7:17:26 AM (8 years ago)
Author:
mkae (Marko Käning)
Comment:

move autosetuprebase TBD a little upwards

Legend:

Unmodified
Added
Removed
Modified

  • WorkingWithGit

    v22 v23  
    175175Note that L1 and L2 have been modified by this operation; their commit IDs changed because of that. This new state can be pushed back to origin without the need for a merge commit, and the history graph will stay linear. '''We recommend that all developers rebase their changes rather than merge when conflicts occur during pushing.'''
    176176
     177'''T.B.D.:''' See config setting for {{{branch.autosetuprebase}}} [#Initialsetup above].
     178
     179
    177180==== Putting the background knowledge into production ====
    178181First, get all new commits from the remote repository using `git fetch <remote-name>`, where `<remote-name>` identifies the repository from which you want to fetch and defaults to "origin":
    … …  
    193196
    194197'''Warning:''' `git pull` without the `--rebase` flag is a shorthand for `git fetch && git merge origin/master`, which will automatically create a merge commit if it thinks that's necessary.
    195 
    196 '''T.B.D.:''' See config setting for {{{branch.autosetuprebase}}} [#Initialsetup above].
    197198
    198199