* git question
@ 2017-07-06 7:36 Rasmus
2017-07-06 11:58 ` Kaushal Modi
2017-07-06 13:24 ` Kyle Meyer
0 siblings, 2 replies; 3+ messages in thread
From: Rasmus @ 2017-07-06 7:36 UTC (permalink / raw)
To: emacs-orgmode
Hi,
Re commit acabacaa5689f0644a47edae7c66bbdd68418194
http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=acabacaa5689f0644a47edae7c66bbdd68418194
This should probably have gone to maint as it is a bugfix. For some
reason I pushed the commit to master.
Could I now use git cherry-pick to add it maint? Or is there a better
way? Or is it better to just let it live on master and only be part of
the next major Org version?
Thanks,
Rasmus
--
Evidence suggests Snowden used a powerful tool called monospaced fonts
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git question
2017-07-06 7:36 git question Rasmus
@ 2017-07-06 11:58 ` Kaushal Modi
2017-07-06 13:24 ` Kyle Meyer
1 sibling, 0 replies; 3+ messages in thread
From: Kaushal Modi @ 2017-07-06 11:58 UTC (permalink / raw)
To: Rasmus, emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 831 bytes --]
On Thu, Jul 6, 2017, 3:37 AM Rasmus <rasmus@gmx.us> wrote:
> Hi,
>
> Re commit acabacaa5689f0644a47edae7c66bbdd68418194
>
>
> http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=acabacaa5689f0644a47edae7c66bbdd68418194
>
> This should probably have gone to maint as it is a bugfix. For some
> reason I pushed the commit to master.
>
> Could I now use git cherry-pick to add it maint? Or is there a better
> way?
I haven't tried this, but wouldn't that work:
- Cherry pick that commit into maint
- Merge maint into master
My guess is that the second step will result in just a Merge commit in
master, with just commit hash updates. But then the merge pointers between
master and maint will also be synced.
Or
is it better to just let it live on master and only be part of
> the next major Org version?
>
--
Kaushal Modi
[-- Attachment #2: Type: text/html, Size: 1743 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git question
2017-07-06 7:36 git question Rasmus
2017-07-06 11:58 ` Kaushal Modi
@ 2017-07-06 13:24 ` Kyle Meyer
1 sibling, 0 replies; 3+ messages in thread
From: Kyle Meyer @ 2017-07-06 13:24 UTC (permalink / raw)
To: emacs-orgmode
Rasmus <rasmus@gmx.us> writes:
> Hi,
>
> Re commit acabacaa5689f0644a47edae7c66bbdd68418194
>
> http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=acabacaa5689f0644a47edae7c66bbdd68418194
>
> This should probably have gone to maint as it is a bugfix. For some
> reason I pushed the commit to master.
>
> Could I now use git cherry-pick to add it maint? Or is there a better
> way? Or is it better to just let it live on master and only be part of
> the next major Org version?
Yep, git cherry-pick should be used in these situations.
--
Kyle
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-06 13:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-06 7:36 git question Rasmus
2017-07-06 11:58 ` Kaushal Modi
2017-07-06 13:24 ` Kyle Meyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.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).