Re: [RFC PATCH v2] revert: Implement --abort processing

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi again,

Jonathan Nieder writes:
> I don't think that should stop you from thinking about how new
> facilities help or interfere with work at all. ÂYou use magit, right?
> It automates all kinds of things. ÂAnd while each person is going to
> use tools in different ways, that hasn't kept people from getting
> things done in the past.

I use Magit only for staging, unstaging, committing, amending, and
reverting portions.

> If you are thinking "I would never use 'git cherry-pick --abort' --- I
> would just look in the reflog for a commit to 'reset --hard' to", then
> you are *done*. ÂJust document it, make sure the reflog has useful
> content to help out, and wait until someone complains and adds a
> shortcut they like.

Ah, thanks for the helpful advice. I'll stay away from deciding
end-user interfaces altogether, and just write in the infrastructure
for sequencing commits with a minimalistic UI. People can add more
later :)

> As a side note, I'm curious about
> why you end up needing to remove the CHERRY_PICK_HEAD. ÂIs "git commit
> -c interesting-patch" misbehaving somehow? Â(It should ignore the
> CHERRY_PICK_HEAD entirely.)

Sorry, I should have been clearer.  I remove the CHERRY_PICK_HEAD to
avoid hitting "commit", "commit --amend" by mistake.  With "git commit
-c", it displays a pleasant message:

# It looks like you may be committing a cherry-pick.
# If this is not correct, please remove the file
#	.git/CHERRY_PICK_HEAD
# and try again.

-- Ram
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]