(Created page with '= Page for Storing All the Weird Stuff Git Says and How to Fix or Understand It == * From the git-pull man page: Runs git-fetch with the given parameters, and calls git-merge...') |
|||
| Line 1: | Line 1: | ||
| + | {{warning|This page is yet to be reviewed for changes required by the migration to Git. Information and commands on this page may no longer be valid and should be used with care. Please see the [[Development/Git|KDE Git hub page]] for more details. }} | ||
| + | |||
= Page for Storing All the Weird Stuff Git Says and How to Fix or Understand It == | = Page for Storing All the Weird Stuff Git Says and How to Fix or Understand It == | ||
| Warning |
|---|
| This page is yet to be reviewed for changes required by the migration to Git. Information and commands on this page may no longer be valid and should be used with care. Please see the KDE Git hub page for more details. |
* From the git-pull man page: Runs git-fetch with the given parameters, and calls git-merge to merge the retrieved head(s) into the current branch. With --rebase, calls git-rebase instead of git-merge.