unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-devel@gnu.org
Subject: Re: Git transition workflow
Date: Tue, 12 Aug 2014 21:13:40 +0200	[thread overview]
Message-ID: <87lhqtv7vf.fsf@Rainer.invalid> (raw)
In-Reply-To: 87sil214zs.fsf@drakenvlieg.flower

Jan Nieuwenhuizen writes:
>     Daily work
>     If you’re using the command-line:
>
>     git pull
>
> May I suggest to change this to
>  
>     git pull --rebase / git pull -r
>
> or we're going to see a whole lot of merge commits.

If you have local branches you _want_ to rebase, then it is generally
much more useful to set them "rebase=true" in the Git config.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Wavetables for the Terratec KOMPLEXER:
http://Synth.Stromeko.net/Downloads.html#KomplexerWaves




  reply	other threads:[~2014-08-12 19:13 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-11 11:36 Git transition workflow Paul Michael Reilly
2014-08-12  2:28 ` Stephen J. Turnbull
2014-08-12  2:58   ` Eric S. Raymond
2014-08-12  4:09     ` Paul Michael Reilly
2014-08-12  4:14       ` Eric S. Raymond
2014-08-12  3:16 ` Richard Stallman
2014-08-12  8:07   ` Rüdiger Sonderfeld
2014-08-12  8:33     ` Jan Nieuwenhuizen
2014-08-12 19:13       ` Achim Gratz [this message]
2014-08-13  3:59         ` Stephen J. Turnbull
2014-08-13  4:14           ` Ashton Kemerling
2014-08-13 10:30           ` Sergey Organov
2014-08-13 12:52             ` Stefan Monnier
2014-08-13 14:16               ` Sergey Organov
2014-08-13 15:59                 ` Stefan Monnier
2014-08-13 18:15                 ` David Caldwell
2014-08-13 16:17             ` Stephen J. Turnbull
2014-08-13 16:28               ` John Yates
2014-08-13 17:16                 ` Stephen J. Turnbull
2014-08-13 17:20                   ` Achim Gratz
2014-08-13 18:34                     ` Stephen J. Turnbull
2014-08-13 21:09               ` Sergey Organov
2014-08-14 10:44                 ` Michael Mattie
2014-08-13  3:56     ` Richard Stallman

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=87lhqtv7vf.fsf@Rainer.invalid \
    --to=stromeko@nexgo.de \
    --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).