From: Ingo Molnar <mingo@elte.hu>
To: Randy Dunlap <rdunlap@xenotime.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: "git revert" feature suggestion: revert the last commit to a file
Date: Thu, 5 Feb 2009 22:46:30 +0100 [thread overview]
Message-ID: <20090205214630.GA28097@elte.hu> (raw)
In-Reply-To: <498B5418.4050103@xenotime.net>
* Randy Dunlap <rdunlap@xenotime.net> wrote:
> Ingo Molnar wrote:
> > * Randy Dunlap <rdunlap@xenotime.net> wrote:
> >
> >> Junio C Hamano wrote:
> >>> Ingo Molnar <mingo@elte.hu> writes:
> >>>
> >>>> So i have to do something like:
> >>>>
> >>>> git revert $(git log -1 --pretty=format:"%h" kernel/softlockup.c)
> >>>>
> >>>> (tucked away in a tip-revert-file helper script.)
> >>>>
> >>>> But it would be so much nicer if i could do the intuitive:
> >>>>
> >>>> git revert kernel/softlockup.c
> >>>>
> >>>> Or at least, to separate it from revision names cleanly, something like:
> >>>>
> >>>> git revert -- kernel/softlockup.c
> >>> All three shares one issue. Does the syntax offer you a way to give
> >>> enough information so that you can confidently say that it will find the
> >>> commit that touched the path most recently? How is the "most recently"
> >>> defined?
> >>>
> >>> At least you can restate the first one to:
> >>>
> >>> git revert $(git log -1 --pretty=format:"%h" core/softlockup -- kernel/softlockup.c)
> >>>
> >>> to limit to "the one that touched this file _on this topic_".
> >>>
> >>>> Would something like this be possible in generic Git? It would sure be a
> >>>> nice little touch that i would make use of frequently.
> >>>>
> >>>> Or is it a bad idea perhaps? Or have i, out of sheer ignorance, failed to
> >>>> discover some nice little shortcut that can give me all of this already?
> >>> The closest I can think of is
> >>>
> >>> git revert ':/the title of the commit'
> >>>
> >>> but it shares the exact same issue of "how would I limit the search space
> >>> to make sure it finds the right commit".
> >> And it should revert whatever commit is the last/most recent to the
> >> currently used file, i.e., not always revert the same commit.
> >
> > i'm not sure i understand, what do you mean precisely?
>
> Just that someone should be able to use "git revert <filename>" on the
> same file more than one time and git will revert <last> then <last-1> then
> <last-2> etc...
>
> Or it will always revert <last>, where <last> is relative to the currently
> used version of the file.
>
> Does that help?
ah, i understand. No, the second time it should revert the revert.
Last commit means last commit - and a revert is just a normal commit. (it
just happens to be generated as an inverse of an existing commit - but that
relationship is not actually relied on and a revert can be edited, amended,
etc.)
Ingo
next prev parent reply other threads:[~2009-02-05 21:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-05 20:21 "git revert" feature suggestion: revert the last commit to a file Ingo Molnar
2009-02-05 20:50 ` Johannes Schindelin
2009-02-05 20:50 ` Junio C Hamano
2009-02-05 20:54 ` Randy Dunlap
2009-02-05 21:00 ` Ingo Molnar
2009-02-05 21:03 ` Randy Dunlap
2009-02-05 21:46 ` Ingo Molnar [this message]
2009-02-05 21:00 ` Ingo Molnar
2009-02-06 0:15 ` Junio C Hamano
2009-02-06 0:41 ` Johannes Schindelin
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=20090205214630.GA28097@elte.hu \
--to=mingo@elte.hu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rdunlap@xenotime.net \
/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 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.