From: "Nagy Balázs" <js@iksz.hu>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Correct git-pull documentation
Date: Sat, 16 Feb 2008 09:20:43 +0100 [thread overview]
Message-ID: <47B69CDB.7070908@iksz.hu> (raw)
In-Reply-To: <1203137441-52448-1-git-send-email-jaysoffian@gmail.com>
Jay Soffian wrote:
> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
> index 179bdfc..f734f18 100644
> --- a/Documentation/git-pull.txt
> +++ b/Documentation/git-pull.txt
>
...
> @@ -28,17 +29,12 @@ include::merge-options.txt[]
> :git-pull: 1
> include::fetch-options.txt[]
>
> -include::pull-fetch-param.txt[]
> -
> -include::urls-remotes.txt[]
> -
> -include::merge-strategies.txt[]
> -
> \--rebase::
> Instead of a merge, perform a rebase after fetching. If
> there is a remote ref for the upstream branch, and this branch
> was rebased since last fetched, the rebase uses that information
> - to avoid rebasing non-local changes.
> + to avoid rebasing non-local changes. This if the default if
>
... This *is* the default if
> + `branch.<name>.rebase` is set.
> +
> *NOTE:* This is a potentially _dangerous_ mode of operation.
> It rewrites history, which does not bode well when you
>
--
-jul-
next prev parent reply other threads:[~2008-02-16 8:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-16 4:50 [PATCH] Correct git-pull documentation Jay Soffian
2008-02-16 8:20 ` Nagy Balázs [this message]
2008-02-16 9:31 ` Junio C Hamano
2008-02-16 10:04 ` Jay Soffian
-- strict thread matches above, loose matches on Subject: below --
2008-02-19 19:24 Jay Soffian
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=47B69CDB.7070908@iksz.hu \
--to=js@iksz.hu \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
/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.