Still a git newbie...
I added github as a remote OK, but then "git fetch github" doesn;t seem to get me anything. Also tried "git fetch github deken-plugin-history-merged" which prints out:
From github.com:pure-data/pure-data
* branch deken-plugin-history-merged -> FETCH_HEAD
but then I get:
[msp@fuzz pd]$ git branch 0.42 0.43 0.45 0.46 m-audio-workaround * master tmp
So I think there's something I'm not getting...
thanks Miller
On Tue, Nov 17, 2015 at 10:16:48AM +0800, Chris McCormick wrote:
Hi Miller,
I generated a branch of the deken plugin git repository with only the deken-plugin.tcl file changes in it:
https://github.com/pure-data/deken/tree/deken-plugin-only
I rebased it onto your Pure Data master and pushed it to GitHub here:
https://github.com/pure-data/pure-data/tree/deken-plugin-history-merged
To merge this into Pd you can paste the following into a terminal window inside your pure-data repository working copy:
# add github as a remote git remote add github git@github.com:pure-data/pure-data.git # fetch the github remote's branches git fetch github # merge the deken-plugin-history-merged branch git merge deken-plugin-history-merged
This will merge the 114 commits that lead to deken-plugin.tcl into the mainline Pd commit history linked to tcl/pd_deken.tcl thereby preserving the full commit history of the deken plugin changes. The resulting tcl/pd_deken.tcl is exactly the same as the one currently in your repository except that it has the commit history attached.
You can view the full log of the changes to the plugin once merged as follows:
git log --follow tcl/pd_deken.tcl
I hope you'll consider doing this. Git history is important as an archival and code-history preserving mechanism - useful to futurepeople. They will examine our commit histories in minute detail from the comfort of their hover-domes I am sure! Also I want people to see my name many times in Pd's commit history so that they may know my greatness.
Cheers,
Chris.