From: Jason at zx2c4.com (Jason A. Donenfeld)
Subject: Development Flow Improvements
Date: Wed, 28 Sep 2016 01:27:38 +0200 [thread overview]
Message-ID: <CAHmME9oN-dpM2zsgcQby3nHukSdA_9LFrzX8WH=5LB11-E2kkA@mail.gmail.com> (raw)
In-Reply-To: <CAH-DoZ5Zr2+Zg0qczdNouG-2HkPmB++BuXsxE4f04wepViW0jQ@mail.gmail.com>
Hi Jamie,
I won't force commit on master, obviously (well, I've violated this in
the past, but don't intend to in the future). But I'd likely rebase
for-jason branches when merging if that makes the merge strategy
easier. The for-jason branches will be ephemeral; after I merge to
master, they'll be deleted. Here's the output from this process I
carried out earlier today, to give a better impression.
Does that seem reasonable, or is there some common edge case I'm neglecting?
Regards,
Jason
zx2c4 at thinkpad ~/Projects/cgit $ git pull
remote: Counting objects: 23, done.
remote: Compressing objects: 100% (23/23), done.
remote: Total 23 (delta 18), reused 0 (delta 0)
Unpacking objects: 100% (23/23), done.
From ssh://git.zx2c4.com/cgit
* [new branch] ch/css-highlight-table-rows ->
origin/ch/css-highlight-table-rows
* [new branch] ch/for-jason -> origin/ch/for-jason
* [new branch] ch/git-2-10-0 -> origin/ch/git-2-10-0
zx2c4 at thinkpad ~/Projects/cgit $ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
zx2c4 at thinkpad ~/Projects/cgit $ git merge origin/ch/for-jason
Updating ff9893a..11695a5
Fast-forward
Makefile | 2 +-
cgit.c | 2 +-
cgit.h | 8 ++++----
git | 2 +-
shared.c | 28 ++++++++++++++--------------
ui-diff.c | 74
+++++++++++++++++++++++++++++++++++++-------------------------------------
ui-diff.h | 4 ++--
ui-log.c | 2 +-
ui-ssdiff.c | 4 ++--
9 files changed, 63 insertions(+), 63 deletions(-)
zx2c4 at thinkpad ~/Projects/cgit $ git push
Total 0 (delta 0), reused 0 (delta 0)
To ssh://git.zx2c4.com/cgit
ff9893a..11695a5 master -> master
zx2c4 at thinkpad ~/Projects/cgit $ git push origin :ch/for-jason
To ssh://git.zx2c4.com/cgit
- [deleted] ch/for-jason
next prev parent reply other threads:[~2016-09-27 23:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-27 18:52 Jason
2016-09-27 21:05 ` jamie.couture
2016-09-27 23:27 ` Jason [this message]
2016-09-28 7:16 ` mailings
2016-11-24 23:23 ` peter
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='CAHmME9oN-dpM2zsgcQby3nHukSdA_9LFrzX8WH=5LB11-E2kkA@mail.gmail.com' \
--to=cgit@lists.zx2c4.com \
/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.
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 NNTP newsgroup(s).