Re: change remote to track new branch
Hi Folks: On Sat, Aug 03, 2013 at 12:52:15PM -0400, Daniel Convissor wrote: > > Yeah. I had contemplated using the following commands: > > git config remote.wp.fetch \ > "+refs/heads/3.6-branch:refs/remotes/wp/3.6-branch" > git config branch.wp.merge "refs/heads/3.6-branch" > > So is "git remote set-branches" and "git branch --set-upstream-to" just > another syntax for making those same changes to git config? Or do the > new commands do some additional work on the repository (to better keep > track of things, or whatever)? Sorry to be a pest, but I'm curious what the answer is, please. Thank you, --Dan -- T H E A N A L Y S I S A N D S O L U T I O N S C O M P A N Y data intensive web and database programming http://www.AnalysisAndSolutions.com/ 4015 7th Ave #4, Brooklyn NY 11232 v: 718-854-0335 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Bug: Pulling remotes into an empty repo deletes the index
Heya: On Sat, Aug 03, 2013 at 09:57:28AM -0700, Jonathan Nieder wrote: > > Adam hadn't made a commit, so that wouldn't work in this case. Oh, good catch. I saw the add and assumed there was a commit there. --Dan -- T H E A N A L Y S I S A N D S O L U T I O N S C O M P A N Y data intensive web and database programming http://www.AnalysisAndSolutions.com/ 4015 7th Ave #4, Brooklyn NY 11232 v: 718-854-0335 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Bug: Pulling remotes into an empty repo deletes the index
Hey Again Adam:
On Sat, Aug 03, 2013 at 12:39:15PM -0400, Daniel Convissor wrote:
>
> All is not lost. Your local files should be stored in the repository's
> reflog. Examine the output of "git reflog". You can then reset your
> working directory to obtain those files by doing something _like_
> "git reset --hard HEAD@{1}".
A further thought. The most useful thing to do would probably be along
these lines...
git reflog # as mentioned before
git checkout -b myinitialstuff HEAD@{}
git log
git checkout master
git cherry-pick
--Dan
--
T H E A N A L Y S I S A N D S O L U T I O N S C O M P A N Y
data intensive web and database programming
http://www.AnalysisAndSolutions.com/
4015 7th Ave #4, Brooklyn NY 11232 v: 718-854-0335
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: change remote to track new branch
Hi Andreas: On Sat, Aug 03, 2013 at 06:41:46PM +0200, Andreas Schwab wrote: > Daniel Convissor writes: > > Use git config. Yeah. I had contemplated using the following commands: git config remote.wp.fetch \ "+refs/heads/3.6-branch:refs/remotes/wp/3.6-branch" git config branch.wp.merge "refs/heads/3.6-branch" So is "git remote set-branches" and "git branch --set-upstream-to" just another syntax for making those same changes to git config? Or do the new commands do some additional work on the repository (to better keep track of things, or whatever)? Thanks, --Dan -- T H E A N A L Y S I S A N D S O L U T I O N S C O M P A N Y data intensive web and database programming http://www.AnalysisAndSolutions.com/ 4015 7th Ave #4, Brooklyn NY 11232 v: 718-854-0335 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Bug: Pulling remotes into an empty repo deletes the index
Hi Adam:
On Sat, Aug 03, 2013 at 10:01:30PM +1000, Adam A wrote:
> - create a remote repository at URL with commit(s) in it
> - e.g., a new github repo with README and LICENSE files auto-added
> - write some files in a local directory
> - git init
> - git add .
> - the contents of the directory are now in the index
> - git remote add origin URL
> - git pull origin master
>
> The local files added to the index are now completely wiped out and
> replaced with the remote content. I lose all my previous work. :/
All is not lost. Your local files should be stored in the repository's
reflog. Examine the output of "git reflog". You can then reset your
working directory to obtain those files by doing something _like_
"git reset --hard HEAD@{1}".
All hail reflog.
Good luck,
--Dan
--
T H E A N A L Y S I S A N D S O L U T I O N S C O M P A N Y
data intensive web and database programming
http://www.AnalysisAndSolutions.com/
4015 7th Ave #4, Brooklyn NY 11232 v: 718-854-0335
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: change remote to track new branch
Hi Andreas: On Sat, Aug 03, 2013 at 09:14:59AM +0200, Andreas Schwab wrote: > Daniel Convissor writes: > > > Long ago I added a remote to my repo. It is set to track what was then > > WordPress' main release branch (3.4-branch) and created a local branch > > to use it. Well, time marches on. I want to update my remote and > > branch to track the new main release branch (3.6-branch). > > > > Here's how I set things up at the time: > > > > git remote add -t 3.4-branch -f wp https://github.com/WordPress/WordPress > > git checkout -b wp wp/3.4-branch > > Use "git remote set-branches" to change the tracked branches of a > remote. Use "git branch --set-upstream-to" to change the upstream of a > branch (or create a new branch from the new upstream). Thanks. Those commands were introduced in 1.8. Is there a way to do it in 1.7, please? --Dan -- T H E A N A L Y S I S A N D S O L U T I O N S C O M P A N Y data intensive web and database programming http://www.AnalysisAndSolutions.com/ 4015 7th Ave #4, Brooklyn NY 11232 v: 718-854-0335 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
change remote to track new branch
Hi: Long ago I added a remote to my repo. It is set to track what was then WordPress' main release branch (3.4-branch) and created a local branch to use it. Well, time marches on. I want to update my remote and branch to track the new main release branch (3.6-branch). Here's how I set things up at the time: git remote add -t 3.4-branch -f wp https://github.com/WordPress/WordPress git checkout -b wp wp/3.4-branch I've tried various fetch, remote and branch commands to effectuate this change, to no avail. I get messages like "Not a valid ref." I know a major part of this is that my repo only knows of one remote branch (of the many that exist). What I don't know are the commands needed to fetch the right remote branch, set my remote and local branch to track it. Your help will be appreciated, please. Here's some information on the current state of things: git branch -av dev a18677e [ahead 153] backup of 3.4 db master 0d6f9b5 Merge branch 'dev' * wp 42abc67 [ahead 5] Merge branch '3.4-branch' of https://github.com/WordPress/WordPress into wp remotes/git_push_deployer/wordpress c8a5d69 Make my branch names generic. remotes/prod/HEAD -> prod/master remotes/prod/master 0d6f9b5 Merge branch 'dev' remotes/wp/3.4-branch b535358 POT, generated from r24100 remotes/wpconfig/master 3e45a81 LSS 0.27.0. git remote show wp * remote wp Fetch URL: https://github.com/WordPress/WordPress Push URL: https://github.com/WordPress/WordPress HEAD branch: master Remote branch: 3.4-branch tracked Local branch configured for 'git pull': wp merges with remote 3.4-branch Local ref configured for 'git push': master pushes to master (local out of date) Thanks, --Dan -- T H E A N A L Y S I S A N D S O L U T I O N S C O M P A N Y data intensive web and database programming http://www.AnalysisAndSolutions.com/ 4015 7th Ave #4, Brooklyn NY 11232 v: 718-854-0335 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
