How to move a local git repository to the root folder and preserve history? -


i have local git repository inside project. have decided code needs in project want 1 git repository.

current directory structure:

solution->  - project1    - .git  - project2

desired directory structure:

solution->  - .git (tracks both projects)  - project1  - project2

how move .git root folder (solution) can begin watch both project1 , project2 without losing track of modifications/commits?

note: don't care preserving history of files going moved project2 folder.

note: not duplicate (this question) because i'm not moving git repository , whole contents. want move git repository root folder.

the git add -u solution

most elegant, needs 6 commands.

cd solution/ #dot means "move here" mv project1/.git .  #make git add deleted files git add -u  #make recognize them moved git add project1/

now git status should show "renamed..."

git commit -m'moved subfolder'

now check unwanted files , update .gitignore

#add project2: git add --all git commit -m'added project2'

the subfolder solution

  1. in solution/project1/ create subfolder same name: solution/project1/project1/.
  2. move other contents (except .git/, .gitignore, .gitconfig , new subfolder) of solution/project1/ solution/project1/project1/
  3. cd polution/project1, git add --all, git commit -m'moved subfolder
  4. move contents of solution/project1 solution. project files in solution/project1/ , .git , git-files in solution/
  5. cd solution/, git status. watch unwanted files. add them .gitignore
  6. git add --all, git commit -m'added project2'

the git mv solution

cd solution/project1/ mkdir project1/  #now move files git mv git mv foo.txt project1/ git mv bar.js project1/ git mv fizz/ project1/ ....  git commit -m'moved files subfolder' cd ../

now move files solution/project1/ solution. done mv command, don't catch exact syntax.

# should work git status # fix .gitignore if necessary git add --all git commit -m'added project2'

Comments

Post a Comment

Popular posts from this blog

javascript - Bootstrap Popover: iOS Safari strange behaviour -

i looking through twitter bootstrap documentation, , i'm interested in implementing dismissible popover when button clicked. here example bootstrap's docs: http://getbootstrap.com/javascript/#dismiss-on-next-click when press "dismissible popover" button os x safari browser works fine. when access same link above ios safari, button not work. is, popover not dismissed on click. why button not working ios safari? the example linked using data-trigger="focus" attribute. try changing data-trigger="click" . <a tabindex="0" class="btn btn-lg btn-danger" role="button" data-toggle="popover" data-trigger="click" title="dismissible popover" data-content="and here's amazing content. it's engaging. right?">dismissible popover</a>
Read more

Magento/PHP - Get phones on all members in a customer group -

i working on custom magento extension. working around adminhtml part , i've created custom form there. here form code: <?php class vivasindustries_smsnotification_block_adminhtml_sms_sendmass_edit_form extends mage_adminhtml_block_widget_form { public function _preparelayout() { $extensionpath = mage::getmoduledir('js', 'vivasindustries_smsnotification'); $head = $this->getlayout()->getblock('head'); $head->addjs('jquery.js'); $head->addjs('vivas.js'); return parent::_preparelayout(); } protected function _prepareform() { $form = new varien_data_form(array( 'id' => 'edit_form', 'action' => $this->geturl('*/*/save', array('id' => $this->getrequest()->get...
Read more

session - Logging Out Using PHP -

i have seen other programs regarding can't seem make work. doing wrong? want achieve after user logged out, going previous pages become restricted. i have 3 php files: 1. sample.php - main page username , password filled in 2. successful.php - user's page after logging in 3. logout.php - destorys session hinder user access pages after logging out sample.php </html> <form action="" method="post"> <table> <tr> <td>username:</td> <td>password:</td> </tr> <tr> <td><input type="text" name="username"></td> <td><input type="password" name="password"></td> </tr> <tr> <td><input type="submit" value="submit" name="submit"></td> </tr> </table> </form> </html> <?php $servername = "localhost"; $username = ...
Read more