From: Steinar Bang <sb@dod.no>
To: emacs-devel@gnu.org
Subject: Re: A simple git workflow for the rest of us
Date: Sat, 22 Nov 2014 10:29:16 +0100 [thread overview]
Message-ID: <upzcegsvvb0z.fsf@dod.no> (raw)
In-Reply-To: 87vbmfym7i.fsf@olgas.newt.com
>>>>> Bill Wohler <wohler@newt.com>:
> I'd second setting it globally to ensure that it happens universally
> to avoid the spurious merge commits that otherwise ensue.
(I've never understood why "spurious merge commits" bother people so
much. Personally I'm much more concerned with what might happen to my
individual commits if I'm hitting a conflict during rebase: the commit's
diff may no longer be the clear and meaningful diff I indented it to be)
next prev parent reply other threads:[~2014-11-22 9:29 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-15 16:09 A simple git workflow for the rest of us Lars Magne Ingebrigtsen
2014-11-15 16:38 ` Eli Zaretskii
2014-11-15 17:08 ` Lars Magne Ingebrigtsen
2014-11-16 2:57 ` Ted Zlatanov
2014-11-15 17:43 ` Achim Gratz
2014-11-15 18:04 ` Eli Zaretskii
2014-11-15 17:39 ` Achim Gratz
2014-11-15 17:47 ` Lars Magne Ingebrigtsen
2014-11-15 19:47 ` Karl Fogel
2014-11-16 19:05 ` Bill Wohler
2014-11-22 9:23 ` Steinar Bang
2014-11-22 13:35 ` Lars Magne Ingebrigtsen
2014-11-22 15:00 ` Steinar Bang
2014-11-22 15:26 ` Lars Magne Ingebrigtsen
2014-11-15 18:17 ` Andreas Schwab
2014-11-15 20:20 ` Kelvin White
2014-11-15 20:54 ` Kelvin White
2014-11-16 19:33 ` Bill Wohler
2014-11-16 19:43 ` Lars Magne Ingebrigtsen
2014-11-16 20:12 ` Ted Zlatanov
2014-11-16 20:19 ` Eli Zaretskii
2014-11-22 9:29 ` Steinar Bang [this message]
2014-11-23 18:28 ` Bill Wohler
2014-11-24 15:25 ` Sergey Organov
2014-11-15 19:08 ` Lars Magne Ingebrigtsen
2014-11-15 19:46 ` Andreas Schwab
2014-11-16 14:13 ` Lars Magne Ingebrigtsen
2014-11-16 14:34 ` David Engster
2014-11-16 14:42 ` Lars Magne Ingebrigtsen
2014-11-16 14:50 ` David Engster
2014-11-16 14:54 ` Lars Magne Ingebrigtsen
2014-11-16 15:19 ` David Kastrup
2014-11-16 14:36 ` Achim Gratz
2014-11-16 2:15 ` Glenn Morris
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=upzcegsvvb0z.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.