git question

git question

[Rasmus]

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

Re: git question

[Kaushal Modi]

[-- 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 --]

Re: git question

[Kyle Meyer]

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

git question

[Jean-Christophe Helary]

Sorry for the beginner level for this question.

When I do a git pull and I get, for ex:

 etc/NEWS       |  6 ++++++
 lisp/info.el   |  4 ++--
 lisp/server.el | 10 ++++++----

like I just had.

What git command should I use to examine what are the modifications on the three above files?


Jean-Christophe Helary
-----------------------------------------------
http://mac4translators.blogspot.com @brandelune

Re: git question

[Van L]

> Sorry for the beginner level for this question.
> 
> When I do a git pull and I get, for ex:
> 
> etc/NEWS       |  6 ++++++
> lisp/info.el   |  4 ++--
> lisp/server.el | 10 ++++++----
> 
> like I just had.
> 
> What git command should I use to examine what are the modifications on the three above files?

(better to ask this on help-gnu-emacs)

Click on the file to open.

To show version control related keys, type

  C-x v C-h 

and that suggests typing

  C-x v l

if you then click on a commit line and type d, 
you should see a color highlighted diff listing

Re: git question

[Andreas Schwab]

On Jun 27 2018, Jean-Christophe Helary <brandelune@gmail.com> wrote:

> Sorry for the beginner level for this question.
>
> When I do a git pull and I get, for ex:
>
>  etc/NEWS       |  6 ++++++
>  lisp/info.el   |  4 ++--
>  lisp/server.el | 10 ++++++----
>
> like I just had.
>
> What git command should I use to examine what are the modifications on the three above files?

$ git diff HEAD@{1}

shows the difference between HEAD and the previous state of HEAD.

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: git question

[Jean-Christophe Helary]

[-- Attachment #1: Type: text/plain, Size: 817 bytes --]



> On Jun 27, 2018, at 23:12, Van L <van@scratch.space> wrote:
> 
>> Sorry for the beginner level for this question.
>> 
>> When I do a git pull and I get, for ex:
>> 
>> etc/NEWS       |  6 ++++++
>> lisp/info.el   |  4 ++--
>> lisp/server.el | 10 ++++++----
>> 
>> like I just had.
>> 
>> What git command should I use to examine what are the modifications on the three above files?
> 
> (better to ask this on help-gnu-emacs)

Why ?

> Click on the file to open.

I'm on the command line. I can't click on a file.

> To show version control related keys, type

I'm asking for a git command from the command line.
If you mean there are none please say so.


Jean-Christophe Helary
-----------------------------------------------
http://mac4translators.blogspot.com @brandelune



[-- Attachment #2: Type: text/html, Size: 2800 bytes --]

Re: git question

[Yuri Khan]

On Wed, Jun 27, 2018 at 9:03 PM Jean-Christophe Helary
<brandelune@gmail.com> wrote:

> When I do a git pull and I get, for ex:
>
>  etc/NEWS       |  6 ++++++
>  lisp/info.el   |  4 ++--
>  lisp/server.el | 10 ++++++----
>
> like I just had.
>
> What git command should I use to examine what are the modifications on the three above files?

Normally you would first do a “git fetch”, then see the diff between
current state and the remote branch, and only then decide if you want
to merge that:

$ git fetch
$ git diff HEAD..origin/master
$ git merge origin/master

(substitute a different remote branch name as necessary).

But if you did a blind pull already, you can look back this way:

$ git diff HEAD@{1}..

Re: git question

[Jean-Christophe Helary]

[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]



> On Jun 27, 2018, at 23:23, Yuri Khan <yurivkhan@gmail.com> wrote:
> 
> On Wed, Jun 27, 2018 at 9:03 PM Jean-Christophe Helary
> <brandelune@gmail.com> wrote:
> 
>> When I do a git pull and I get, for ex:
>> 
>> etc/NEWS       |  6 ++++++
>> lisp/info.el   |  4 ++--
>> lisp/server.el | 10 ++++++----
>> 
>> like I just had.
>> 
>> What git command should I use to examine what are the modifications on the three above files?
> 
> Normally you would first do a “git fetch”, then see the diff between
> current state and the remote branch, and only then decide if you want
> to merge that:

:) I trust the commiters to only commit proper code. I'm just curious about some files sometimes.
But thank you for the hint !

> $ git fetch
> $ git diff HEAD..origin/master
> $ git merge origin/master
> 
> (substitute a different remote branch name as necessary).
> 
> But if you did a blind pull already, you can look back this way:
> 
> $ git diff HEAD@{1}..

Thank you, and thank you Andreas for the same reply.

Now, if I want to only check 1 file out of the multiple files that have been commited ?


Jean-Christophe Helary
-----------------------------------------------
http://mac4translators.blogspot.com @brandelune



[-- Attachment #2: Type: text/html, Size: 3310 bytes --]

Re: git question

[Andreas Schwab]

On Jun 27 2018, Jean-Christophe Helary <brandelune@gmail.com> wrote:

> Now, if I want to only check 1 file out of the multiple files that have been commited ?

Just add it to the command line.

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: git question

[Yuri Khan]

On Wed, Jun 27, 2018 at 9:29 PM Jean-Christophe Helary
<brandelune@gmail.com> wrote:

> $ git diff HEAD@{1}..
>
> Thank you, and thank you Andreas for the same reply.

Note the subtle difference: “git diff HEAD@{1}..” will give the diff
between previous and current states, while “git diff HEAD@{1}” will
give the same diff but in reverse.

Re: git question

[Jean-Christophe Helary]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]



> On Jun 27, 2018, at 23:43, Andreas Schwab <schwab@suse.de> wrote:
> 
> On Jun 27 2018, Jean-Christophe Helary <brandelune@gmail.com> wrote:
> 
>> Now, if I want to only check 1 file out of the multiple files that have been commited ?
> 
> Just add it to the command line.

Thank you.

> 
> Andreas.
> 
> -- 
> Andreas Schwab, SUSE Labs, schwab@suse.de
> GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
> "And now for something completely different."

Jean-Christophe Helary
-----------------------------------------------
http://mac4translators.blogspot.com @brandelune



[-- Attachment #2: Type: text/html, Size: 2470 bytes --]

Re: git question

[Jean-Christophe Helary]

[-- Attachment #1: Type: text/plain, Size: 643 bytes --]



> On Jun 27, 2018, at 23:49, Yuri Khan <yurivkhan@gmail.com> wrote:
> 
> On Wed, Jun 27, 2018 at 9:29 PM Jean-Christophe Helary
> <brandelune@gmail.com> wrote:
> 
>> $ git diff HEAD@{1}..
>> 
>> Thank you, and thank you Andreas for the same reply.
> 
> Note the subtle difference: “git diff HEAD@{1}..” will give the diff
> between previous and current states, while “git diff HEAD@{1}” will
> give the same diff but in reverse.

Thank you for the notice. The difference had escaped me.


Jean-Christophe Helary
-----------------------------------------------
http://mac4translators.blogspot.com @brandelune



[-- Attachment #2: Type: text/html, Size: 2333 bytes --]

Re: git question

[Jean-Christophe Helary]

[-- Attachment #1: Type: text/plain, Size: 421 bytes --]



> On Jun 27, 2018, at 23:19, Andreas Schwab <schwab@suse.de> wrote:

> $ git diff HEAD@{1}
> 
> shows the difference between HEAD and the previous state of HEAD.

So when I do
 git diff HEAD@{2}

I get the result vs the state of HEAD 2 "git pull" before on my machine, right ?


Jean-Christophe Helary
-----------------------------------------------
http://mac4translators.blogspot.com @brandelune



[-- Attachment #2: Type: text/html, Size: 2025 bytes --]

Re: git question

[Andreas Schwab]

On Jun 27 2018, Yuri Khan <yurivkhan@gmail.com> wrote:

> On Wed, Jun 27, 2018 at 9:29 PM Jean-Christophe Helary
> <brandelune@gmail.com> wrote:
>
>> $ git diff HEAD@{1}..
>>
>> Thank you, and thank you Andreas for the same reply.
>
> Note the subtle difference: “git diff HEAD@{1}..” will give the diff
> between previous and current states, while “git diff HEAD@{1}” will
> give the same diff but in reverse.

No, they are both the same (unless your working tree is in modified
state).

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: git question

[Andreas Schwab]

On Jun 28 2018, Jean-Christophe Helary <brandelune@gmail.com> wrote:

>> On Jun 27, 2018, at 23:19, Andreas Schwab <schwab@suse.de> wrote:
>
>> $ git diff HEAD@{1}
>> 
>> shows the difference between HEAD and the previous state of HEAD.
>
> So when I do
>  git diff HEAD@{2}
>
> I get the result vs the state of HEAD 2 "git pull" before on my machine, right ?

Depends on what you did inbetween.  See git-reflog(1).

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: git question

[Jean-Christophe Helary]

[-- Attachment #1: Type: text/plain, Size: 920 bytes --]



> On Jun 28, 2018, at 0:05, Andreas Schwab <schwab@suse.de> wrote:
> 
> On Jun 28 2018, Jean-Christophe Helary <brandelune@gmail.com> wrote:
> 
>>> On Jun 27, 2018, at 23:19, Andreas Schwab <schwab@suse.de> wrote:
>> 
>>> $ git diff HEAD@{1}
>>> 
>>> shows the difference between HEAD and the previous state of HEAD.
>> 
>> So when I do
>> git diff HEAD@{2}
>> 
>> I get the result vs the state of HEAD 2 "git pull" before on my machine, right ?
> 
> Depends on what you did inbetween.  See git-reflog(1).

Excellent. Thank you !

" For example, HEAD@{2} means "where HEAD used to be two moves ago",
       master@{one.week.ago} means "where master used to point to one week ago in this local
       repository", and so on. See gitrevisions(7) for more details. "


Jean-Christophe Helary
-----------------------------------------------
http://mac4translators.blogspot.com @brandelune



[-- Attachment #2: Type: text/html, Size: 2920 bytes --]

Re: git question

[Eli Zaretskii]

> From: Yuri Khan <yurivkhan@gmail.com>
> Date: Wed, 27 Jun 2018 21:49:23 +0700
> Cc: Emacs developers <emacs-devel@gnu.org>
> 
> Note the subtle difference: “git diff HEAD@{1}..” will give the diff
> between previous and current states, while “git diff HEAD@{1}” will
> give the same diff but in reverse.

You mean ..HEAD@{1} will give the reverse diffs, right?

Re: git question

[Yuri Khan]

On Wed, Jun 27, 2018 at 10:02 PM Andreas Schwab <schwab@suse.de> wrote:

> No, they are both the same (unless your working tree is in modified
> state).

Sorry, you are right.

Re: git question

[Eric Abrahamsen]

Andreas Schwab <schwab@suse.de> writes:

> On Jun 27 2018, Jean-Christophe Helary <brandelune@gmail.com> wrote:
>
>> Sorry for the beginner level for this question.
>>
>> When I do a git pull and I get, for ex:
>>
>>  etc/NEWS       |  6 ++++++
>>  lisp/info.el   |  4 ++--
>>  lisp/server.el | 10 ++++++----
>>
>> like I just had.
>>
>> What git command should I use to examine what are the modifications on the three above files?
>
> $ git diff HEAD@{1}
>
> shows the difference between HEAD and the previous state of HEAD.

That was new to me -- thanks! Just for completeness' sake, the explicit
(non-relative) way of doing this would be to look at the top of the
fast-forward message and use the updated-from commit as an anchor:

From git.sv.gnu.org:/srv/git/emacs
   61f73703c7..ce54573dac  master     -> origin/master
   12c77f6918..9134c841f1  emacs-26   -> origin/emacs-26
Updating 61f73703c7..ce54573dac
Fast-forward
 doc/emacs/files.texi          |  2 +-
 doc/lispref/internals.texi    |  3 ++-
 etc/NEWS                      |  6 ++++++
 lisp/emacs-lisp/regexp-opt.el | 10 +++++-----
 lisp/ido.el                   | 15 +++++++++++----
 lisp/info.el                  |  4 ++--
 lisp/net/tramp-sh.el          |  6 +++++-
 lisp/server.el                | 10 ++++++----
 lisp/textmodes/css-mode.el    |  3 +++
 9 files changed, 41 insertions(+), 18 deletions(-)

$ git log 61f73703c7..

Re: git question

[Jean-Christophe Helary]

[-- Attachment #1: Type: text/plain, Size: 791 bytes --]



> On Jun 28, 2018, at 0:52, Eric Abrahamsen <eric@ericabrahamsen.net> wrote:
> 
>> $ git diff HEAD@{1}
>> 
>> shows the difference between HEAD and the previous state of HEAD.
> 
> That was new to me -- thanks! Just for completeness' sake, the explicit
> (non-relative) way of doing this would be to look at the top of the
> fast-forward message and use the updated-from commit as an anchor:
> 
> From git.sv.gnu.org <http://git.sv.gnu.org/>:/srv/git/emacs
>   61f73703c7..ce54573dac  master     -> origin/master
>   12c77f6918..9134c841f1  emacs-26   -> origin/emacs-26
> Updating 61f73703c7..ce54573dac

> $ git log 61f73703c7..


I'm glad I asked. Thank you all !

Jean-Christophe Helary
-----------------------------------------------
http://mac4translators.blogspot.com @brandelune



[-- Attachment #2: Type: text/html, Size: 9859 bytes --]

Re: git question

[Lele Gaifax]

Jean-Christophe Helary <brandelune@gmail.com> writes:

> I'm on the command line. I can't click on a file.

I have the following in my ~/.gitconfig

[alias]
        ll = log -p --reverse @{1}..

I usually execute a "git ll" just after any "git pull" I do

ciao, lele.
-- 
nickname: Lele Gaifax | Quando vivrò di quello che ho pensato ieri
real: Emanuele Gaifas | comincerò ad aver paura di chi mi copia.
lele@metapensiero.it  |                 -- Fortunato Depero, 1929.

Re: git question

[Jean-Christophe Helary]

[-- Attachment #1: Type: text/plain, Size: 365 bytes --]

Thank you.

> On Jun 28, 2018, at 20:17, Lele Gaifax <lele@metapensiero.it> wrote:

> I have the following in my ~/.gitconfig
> 
> [alias]
>        ll = log -p --reverse @{1}..
> 
> I usually execute a "git ll" just after any "git pull" I do


Jean-Christophe Helary
-----------------------------------------------
http://mac4translators.blogspot.com @brandelune



[-- Attachment #2: Type: text/html, Size: 1982 bytes --]