Changes between Version 20 and Version 21 of WorkingWithGit
- Timestamp:
- Aug 21, 2016, 7:08:15 AM (8 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
WorkingWithGit
v20 v21 5 5 [[PageOutline]] 6 6 7 == Initial setup == 7 == Initial setup == #Initialsetup 8 8 9 9 Start with some basic setup (based on [https://community.kde.org/Infrastructure/Git/Configuration KDE's configuration hints]): … … 120 120 Note that the push will fail if the remote repository has new changes. Contrary to Subversion, it does not matter whether your changes conflict with the remote ones. If this happens, you must update your local working copy as described in the [#updating section on fetch the latest changes] and re-try the push. 121 121 122 '''T.B.D.:''' See config setting for {{{push.default}}} [#Initialsetup above], which requires the user to explicitly state the target branch, i.e. it should now be e.g. {{{git push origin master}}}. 123 124 122 125 === Merge a single change from master into a release branch === #cherrypick 123 126 The equivalent to Subversion's `svn merge -c <revision> .` is `git cherry-pick`. Use `git cherry-pick` to apply a single change from master to a release branch. To do this, look up the commit ID of the commit you want to pick: … … 139 142 }}} 140 143 144 '''T.B.D.:''' Here as well see config setting for {{{push.default}}} [#Initialsetup above] requiring a target branch, i.e. it should now be e.g. {{{git push origin master}}}. 141 145 142 146 == Common `git` tasks & notes about MacPorts' Subversion export == … … 191 195 192 196 '''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. 197 198 '''T.B.D.:''' See config setting for {{{branch.autosetuprebase}}} [#Initialsetup above]. 199 193 200 194 201 === Commit messages === #commitmessages … … 202 209 1. Wrap the body at 72 characters 203 210 1. Use the body to explain what and why vs. how 211 212 '''T.B.D.:''' See todo on {{{~/.git-commit-template}}} [#Initialsetup above]. 204 213 205 214 === Reverting changes === #revert