@Xnero The sequence of commands I use is foobarCurrentBranch=`git rev-parse --abbrev-ref HEAD`; git fetch --all --prune; git checkout deploy; git reset --hard `git remote | grep -v origin`/deploy; git push origin deploy; git checkout master; git reset --hard `git remote | grep -v origin`/master; git push origin master; git checkout $foobarCurrentBranch

However, that sequence relies on having previously set up your GitHub repository as the origin and the Charcoal-SE repository as another remote repository. It also updates both the deploy and master branches (both are needed if you're running a SmokeDetector instanace out of your GitHub repository for testing).

The actual entry in my .gitconfig file is:

[guitool "sync master and deploy NO stash"]
	cmd = "foobarCurrentBranch=`git rev-parse --abbrev-ref HEAD`; git fetch --all --prune; git checkout deploy; git reset --hard `git remote | grep -v origin`/deploy; git push origin deploy; git checkout master; git reset --hard `git remote | grep -v origin`/master; git push origin master; git checkout $foobarCurrentBranch"

That can either be directly added to your .gitconfig file, or you can use the Git Gui user interface to add a tool with the portions that are enclosed in "".

@Xnero You will need to clone your GitHub repository to a local directory.

@Xnero Yes, along with a reference to your repository, which may be a URL, or other reference. A URL can be obtained from the green "Code" button that is displayed when viewing the GitHub page for your repository.

@Xnero You should be able to just move the directory, as long as you're moving the whole directory.

@Xnero You need to add the Charcoal-SE/SmokeDetector repository as an additional remote. You could do so with the command git remote add Charcoal-SE https://github.com/Charcoal-SE/SmokeDetector.git

@Xnero You then probably want to do git fetch --all

@Xnero OK. The "sync master and deploy NO stash" sequence should now work. Ahh...wait. However, that sequence assumes you have not changed your GitHub repository's master branch to something which is not fast-forwardable to the HEAD of the main repository's master branch, but you have done so.

So, I suggest you create a new branch to mark/track the work you've already done in your GitHub repository's master branch. Doing so will make it so you don't loose easy access to the changes you've made in that branch when the master branch is changed to match the main repository.

OK, then the sequence should work to update both the master and deploy branches in both your local and GitHub repositories to match the master and deploy branches in Charcoal-SE/SmokeDetector.

@Xnero No, that's just a variable name, which just needs to not be the same as any other variable you're using, in order to not interfere with whatever other use you may have. Hmmm... it does assume that grep is available in the path. It sort-of assumes that it's running under bash, but git bash is a "normal" part of a Windows git install.

@Xnero You can, if you want to be able to easily do it multiple times. If you just want to do it once, then you could open a Git Bash from Git Gui's "Repository" dropdown menu and then copy and paste the command into that (assuming you're not already running terminal based on bash.

You can do something very similar in other shells, including Windows' PowerShell, but the syntax for some commands may be a bit different

My personal choice was to add it as a tool.

@Makyen This message had multiple ` characters which were part of the series of commands, but which chat interpreted as Markdown formatting. Unfortunately, I did not notice that earlier and quote those characters in the Markdown. I've updated it so that it now appears to display correctly, which should be an exact match for the part in double quotes of the cmd line in my later message in that monologue which is completely code.

@Xnero Unfortunately, that portion the above message was a bit mangled when Chat converted from Markdown. That's actually git reset --hard `git remote | grep -v origin`/master. The portion within `` characters is run by the shell prior to the command line it's in and the result is used as part of the current command line. git remote will list all identifiers used for each remote repository.

git remote | grep -v origin will result in only retaining the remote which isn't "origin" (actually those remotes, but the code assumes 2). Given the intent is to synchronize to the other repository, this is a way to not hardcode the identifier for the other repository which isn't "origin". The code does, however, assume that there's a total of two remote repositories defined. It just doesn't require the other remote to have been given a specific identifier.

Enclosing that in `` causes the result of the command to be included as part of the command line, so the command that is part of becomes git reset --hard [the other remote repository's identifier]/master, which in this instance will be git reset --hard Charcoal-SE/master. IIRC, I changed that to not hardcoding the other remote identifier the last time we discussed this to accommodate the code being used by someone who had not made the same choice I had for the other remote's identifier.

np

@Xnero Yep. That's a good thing. :)

@Xnero That's a good question. I haven't checked.

@Xnero The code that will be run will be in your .gitconfig file. IIRC, that can be either, or both, at the repository level and/or within the user's home directory. On Windows, your "home" directory is one level up from your Documents folder.

@Xnero Yes, but how to do it will depend on which shell you're using, your operating system, etc. There should be numerous questions/answers on a few/several SE sites which cover the various possibilities.

@Xnero That it worked is likely at least partially a result of the existing state of your repository. I'd have to take a more detailed look to see exactly what's going on.

@Xnero I would, or just directly edit the .gitconfig file (once you find it) and restart Git Gui.

@Xnero I'm unsure what you're asking. If you're entering that command into the Git Gui tool interface, there are no double quote marks (") involved. The double quotes only exist in the .gitconfig file to indicate what the text of the command is.

@Xnero np

@Xnero I wouldn't inquire at all. People getting annoyed at having to review and (almost always) approve blacklist PRs is the primary way that it's determined that it's time to give the user that privilege.