![]() * b9455336 (HEAD -> perso, origin/perso) Merge branch 'master' into perso GitHub\zenphoto-perso>git log -graph -oneline It's the new feature commit that you're not seeing sometimes in the repository, correct? * fc8c810a Merge pull request #1117 from vincent3569/master * 928c6812 Fix undeclared global js variables required by admin toolbox for delete links. * a4cdd5d0 Revert: Again use htmlawed as fallback only if native php tidy extension is not available #1116 * 664c4fac Merge pull request #1119 from vincent3569/master * 26e04786 Small text addition to last pull request/commit as manual pagebreak is not exactly tinyMCE dependent. * 316514f2 Show note in admintoolbox if site status is "closed for testing" fix #1120 | * | 407b490a update french translations * | \ b2d89737 Merge branch 'master' into perso | * ad806e28 Merge pull request #1121 from vincent3569/master * b9455336 Merge branch 'master' into perso ~/src/test/zenphoto-perso/ git log -graph -oneline On my_repo/master I made a "merge into current branch" from upstream/master.Īnd on my_repo/perso I made a "merge into current branch" from master.Īfter that, my personnal commit on my_repo/perso desapears from changes history of this branch. I want to keep my fork sync with upstream (although it seems to be useless since my repo is up to date because I am at the initiative of the changes). I merge master branch into perso branch (so I have all commits of my new feature + my translations update)Īfter the pull request has been merged into upstream/master, ![]() ![]() In master branch, I updated some translations and I made a pull request to the initial repo. In my repo, I have 2 branchs (master and perso). I have a repositoty ( ) that is a fork from another repo ( ) ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |