All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es>
To: git@vger.kernel.org
Subject: [PATCH] rebase -i: inform the user they can re-order commits
Date: Fri, 16 Mar 2012 12:13:30 +0100	[thread overview]
Message-ID: <4F63205A.6000202@seap.minhap.es> (raw)

Same as they are informed of what the different commands
do and that they can remove commits.
---
Hi, I was using git rebase -i for some time now and never
occured to me I could reorder the commit lines to affect
the order the commits are applied, learnt that recently 
from a git tutorial, I must admit I have now checked the 
man page and it's well explained, but remarking that on
the user-input screen is an useful addition imo.

 git-rebase--interactive.sh |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 5812222..acf1f5c 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -846,6 +846,8 @@ cat >> "$todo" << EOF
 #  f, fixup = like "squash", but discard this commit's log message
 #  x, exec = run command (the rest of the line) using shell
 #
+# You can re-order the commit lines to affect the order on which
+# the commits will be applied.
 # If you remove a line here THAT COMMIT WILL BE LOST.
 # However, if you remove everything, the rebase will be aborted.
 #
-- 
1.7.7.6

             reply	other threads:[~2012-03-16 10:15 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-16 11:13 Nelson Benitez Leon [this message]
2012-03-16 10:21 ` [PATCH] rebase -i: inform the user they can re-order commits Matthieu Moy
2012-03-16 11:34   ` Nelson Benitez Leon
2012-03-16 11:53     ` Matthieu Moy
2012-03-16 13:36       ` Jakub Narebski
2012-03-16 12:17   ` Junio C Hamano
2012-03-16 15:07     ` Nelson Benitez Leon
2012-03-16 14:12       ` Matthieu Moy
2012-03-16 14:26         ` Junio C Hamano
2012-03-16 14:36           ` Matthieu Moy
2012-03-16 14:46             ` Junio C Hamano
2012-03-16 14:39           ` Junio C Hamano
2012-03-20 23:07             ` Junio C Hamano
2012-03-21  8:25               ` Matthieu Moy
2012-03-21 10:45                 ` Philip Oakley

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=4F63205A.6000202@seap.minhap.es \
    --to=nelsonjesus.benitez@seap.minhap.es \
    --cc=git@vger.kernel.org \
    /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.