unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Steinar Bang <sb@dod.no>
To: emacs-devel@gnu.org
Subject: Re: Rewriting bzrmerge.el
Date: Sun, 23 Nov 2014 17:32:57 +0100	[thread overview]
Message-ID: <upzcvbm5swqu.fsf@dod.no> (raw)
In-Reply-To: <87389brle1.fsf@engster.org> (David Engster's message of "Sat, 22 Nov 2014 22:11:18 +0100")

>>>>> David Engster <deng@randomsample.de>:

> It will always be able to merge origin/emacs-24. I guess you could set
> things up to merge from a second, separate clone (by adding it as a
> remote), but I don't see the need.

You don't need a clone for this, just a local bare repo.

I'm assuming that the two separate clones are %USERPROFILE%\emacs\master
and %USERPROFILE%\emacs\master for the examples above.

Open a magit bash window, and do this:
 mkdir -p $HOME/repositories/local/
 (cd $HOME/repositories/local; rm -rf emacs.git; git init --bare emacs.git)
 cd $HOME/emacs/master
 git remote add local $HOME/repositories/local/emacs.git
 cd $HOME/emacs/emacs-24
 git remote add local $HOME/repositories/local/emacs.git

And now you're ready to go.

If you have added a change to emacs-24 and want it on master, then do
this (in magit bash):
 cd $HOME/emacs/emacs-24
 git push local HEAD
 cd $HOME/emacs/master
 git fetch local
 git merge local/emacs-24

(if you were using a feature branch instead of emacs-24, you could just
push it instead of "emacs-24" that was used in the example).

To speed things up and keep the local repo small, you can do this:
 (cd $HOME/repositories/outgoing/emacs.git; git gc --prune=now --aggressive)

If you have lots of clutter in the local repo (eg. lots of defunct
feature branches), you can just do this and start fresh:
 (cd $HOME/repositories/local; rm -rf emacs.git; git init --bare emacs.git)

One reason for using magit bash instead of using git from regular
cmd.exe (which I also sometimes do), is that magit bash does TAB expand
on tags and branch names.



  parent reply	other threads:[~2014-11-23 16:32 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-27  0:07 git transition issues Eric S. Raymond
2014-10-27  1:08 ` Stefan Monnier
2014-10-27  1:28   ` Eric S. Raymond
2014-10-27 13:10     ` Stefan Monnier
2014-10-28 15:35     ` Glenn Morris
2014-10-28 16:36       ` Eric S. Raymond
2014-10-28 18:01         ` Eli Zaretskii
2014-10-28 18:07           ` Eric S. Raymond
2014-10-28 18:19             ` Eli Zaretskii
2014-10-29  0:58               ` Stefan Monnier
2014-10-31  9:17                 ` Eli Zaretskii
2014-10-31 10:23                   ` Eric S. Raymond
2014-10-31 10:27                     ` Eli Zaretskii
2014-10-31 10:51                       ` Eric S. Raymond
2014-10-31 11:03                         ` Eli Zaretskii
2014-10-31 13:00                           ` Eric S. Raymond
2014-11-01  0:39                             ` Stephen J. Turnbull
2014-11-15 14:52   ` Rewriting bzrmerge.el (was: git transition issues) David Engster
2014-11-15 15:40     ` Rewriting bzrmerge.el Paul Eggert
2014-11-15 16:01       ` Stefan Monnier
2014-11-15 16:32       ` Eli Zaretskii
2014-11-15 16:04     ` Stefan Monnier
2014-11-15 16:10       ` David Engster
2014-11-15 16:26         ` David Engster
2014-11-16  3:50           ` Stefan Monnier
2014-11-21 22:47             ` David Engster
2014-11-22  8:16               ` Eli Zaretskii
2014-11-22 16:13                 ` David Engster
2014-11-22 16:42                   ` Eli Zaretskii
2014-11-22 17:17                     ` David Engster
2014-11-22 20:30                       ` Eli Zaretskii
2014-11-22 21:11                         ` David Engster
2014-11-23  3:35                           ` Eli Zaretskii
2014-11-23 16:32                           ` Steinar Bang [this message]
2014-11-23 17:49                             ` David Engster
2014-11-23 17:50                             ` Eli Zaretskii
2014-11-23 18:40                               ` Steinar Bang
2014-11-23 19:49                                 ` Eli Zaretskii
2014-11-22 22:28                         ` Stefan Monnier
2014-11-22 23:02                         ` Lars Magne Ingebrigtsen
2014-11-23  0:22                           ` Stephen J. Turnbull
2014-11-23  8:01                             ` David Kastrup
2014-11-23 16:08                               ` Eli Zaretskii
2014-11-23 16:29                                 ` Achim Gratz
2014-11-23 17:49                                   ` Eli Zaretskii
2014-11-23 16:29                                 ` David Kastrup
2014-11-23 16:42                                 ` Stephen J. Turnbull
2014-11-23 16:49                                   ` David Kastrup
2014-11-23 17:33                                   ` Eli Zaretskii
2014-11-23 16:41                               ` Steinar Bang
2014-11-23 14:22                             ` Lars Magne Ingebrigtsen
2014-11-23 15:08                               ` Ken Brown
2014-11-23 15:11                               ` Stephen J. Turnbull
2014-11-23 15:21                                 ` Lars Magne Ingebrigtsen
2014-11-24 15:11                                 ` Eli Zaretskii
2014-11-24 18:18                                   ` Stephen J. Turnbull
2014-11-24 18:26                                     ` Eli Zaretskii
2014-11-24 18:59                                       ` Stephen J. Turnbull
2014-11-24 19:06                                         ` Eli Zaretskii
2014-11-23  3:46                           ` Eli Zaretskii
2014-11-24  3:59                           ` Stefan Monnier
2014-11-24 13:09                             ` Eli Zaretskii
2014-11-22 15:57               ` Stefan Monnier
2014-11-23 17:18               ` David Engster
2014-11-15 16:26     ` Eli Zaretskii
2014-11-15 16:34       ` David Engster
2014-11-15 17:50         ` David Kastrup
2014-11-15 18:06           ` Eli Zaretskii
2014-11-15 18:20             ` David Kastrup
2014-11-15 20:02             ` David Engster
2014-10-27  1:42 ` git transition issues David Caldwell
2014-10-27  1:55   ` Eric S. Raymond
2014-10-28 15:33     ` Glenn Morris
2014-10-28 21:16   ` Randal L. Schwartz
2014-10-28 21:31     ` Randal L. Schwartz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=upzcvbm5swqu.fsf@dod.no \
    --to=sb@dod.no \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).