[RFC/PATCH 1/2] Doc rebase: Describe rebase as excluding merge commits

From: Philip Oakley <philipoakley@iee.org>
Date: May 19, 2013, 11:52 UTC
Message-ID: <1368964329-1600-2-git-send-email-philipoakley@iee.org>
In-Reply-To: <1368964329-1600-1-git-send-email-philipoakley@iee.org>

Describe rebase in the description section.

Include a softer paraphrased version from the crytic, well-loved, but sometimes parodied, Name description, and tell users that merge commits are excluded by default.

Signed-off-by: Philip Oakley <philipoakley@iee.org>

---

http://article.gmane.org/gmane.comp.version-control.git/217410
http://article.gmane.org/gmane.comp.version-control.git/217495
---
 Documentation/git-rebase.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index aca8405..87a8095 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -16,6 +16,10 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
+'git rebase' will transfer local commits, excluding merge commits
+by default, to the head of the branch's upstream, or onto a new base
+if given.
+
 If <branch> is specified, 'git rebase' will perform an automatic
 `git checkout <branch>` before doing anything else.  Otherwise
 it remains on the current branch.

-- 
1.8.1.msysgit.1