Follow-up Comment #60, patch #6104 (project freeciv): How to merge different commits:
On the command line git rebase -i master This will open up a text editor. Each commit will be on a line starting with the command pick. To merge a commit into the commit above change the "pick" command to the letter "f" (or the full command name) Don't remove any line unless you wish to delete the patch completely. Save the file once you are. Git will now perform the rebase commands from the texts file. If you make a mistake read up on the "git reflog" command. For details about rebasing see http://git-scm.com/book/en/v2/Git-Branching-Rebasing _______________________________________________________ Reply to this item at: <http://gna.org/patch/?6104> _______________________________________________ Message sent via/by Gna! http://gna.org/ _______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
