Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit
From: Eric Sunshine <hidden>
Date: 2016-06-15 23:05:00
On Tue, May 26, 2015 at 5:38 PM, Galan Rémi [off-list ref] wrote:
git-rebase -i: Add key word "drop" to remove a commit
"key word" is unusual. More typical is "keyword". However, perhaps
"command" might be even better. Also, custom on this project is not to
capitalize, so:
git-rebase -i: add command "drop" to remove a commit
Instead of removing a line to remove the commit, you can use the key word "drop" (just like "pick" or "edit"). It has the same effect as deleting the line (removing the commit) except that you keep a visual trace of your actions, allowing a better control and reducing the possibility of removing a commit by mistake.
Nicely explained. Ditto regarding "key word".
quoted hunk ↗ jump to hunk
Signed-off-by: Galan Rémi <redacted> ---diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 1d01baa..3cd2ef2 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt@@ -514,6 +514,9 @@ rebasing. If you just want to edit the commit message for a commit, replace the command "pick" with the command "reword". +If you want to remove a commit, replace the command "pick" by the +command "drop".
I think the existing method of removing a commit merits mention here. Perhaps:
To drop a commit, delete its line or replace the command
"pick" with "drop".
Or, if you want to emphasize "drop":
To drop a commit, replace the command "pick" with "drop",
or just delete its line.
quoted hunk ↗ jump to hunk
If you want to fold two or more commits into one, replace the command "pick" for the second and subsequent commits with "squash" or "fixup". If the commits had different authors, the folded commit will bediff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index dc3133f..cb749e8 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh