From: Jay Soffian <jaysoffian@gmail.com>
To: git@vger.kernel.org
Cc: Jay Soffian <jaysoffian@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 2/2] pull: document usage via OPTIONS_SPEC
Date: Fri, 22 Feb 2008 19:52:30 -0500 [thread overview]
Message-ID: <1203727950-14980-2-git-send-email-jaysoffian@gmail.com> (raw)
In-Reply-To: <1203727950-14980-1-git-send-email-jaysoffian@gmail.com>
document usage via OPTIONS_SPEC
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
git-pull.sh | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 3ce32b5..194c1d0 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -4,10 +4,36 @@
#
# Fetch one or more remote refs and merge it/them into the current HEAD.
-USAGE='[-n | --no-summary] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...'
-LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
SUBDIRECTORY_OK=Yes
-OPTIONS_SPEC=
+OPTIONS_SPEC="\
+git pull [options] [<repo>] [<refspec>]
+--
+ fetch options
+q,quiet make the fetch process less verbose
+v,verbose make the fetch process more verbose
+a,append append to FETCH_HEAD instead of overwritting
+upload-pack=, specify path to git-fetch-pack on remote end
+f,force force local branch to be updated by remote branch
+t,tags fetch all remote tags
+no-tags do not fetch any remote tags
+k,keep keep downloaded pack
+u,update-head-ok used internally between git pull and git fetch
+depth= deep shallow history by specified number of commits
+ merge options
+summary show diffstat at end of merge
+n,no-summary do not show diff stat at end of merge
+commit commit the result after merging
+no-commit do not commit the result after merging
+squash update the index and working tree only
+no-squash override --squash, perform a normal merge and commit
+ff only update branch pointer if merge is a fast-forward
+no-ff do a merge commit even if the merge is a fast-forward
+s,strategy= use given merge strategy
+ rebase options
+rebase rebase after fetching
+no-rebase merge after fetching
+s,strategy= use given merge strategy; implies -m to rebase
+"
. git-sh-setup
set_reflog_action "pull $*"
require_work_tree
--
1.5.4.2.285.g1e9f
next prev parent reply other threads:[~2008-02-23 0:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-23 0:52 [PATCH 1/2] pull: pass --strategy along to to rebase Jay Soffian
2008-02-23 0:52 ` Jay Soffian [this message]
2008-02-23 1:15 ` [PATCH 2/2] pull: document usage via OPTIONS_SPEC Junio C Hamano
2008-02-23 1:40 ` Jay Soffian
2008-02-26 20:42 ` [PATCH v2] " Jay Soffian
2008-02-26 21:23 ` Junio C Hamano
2008-02-26 21:37 ` 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=1203727950-14980-2-git-send-email-jaysoffian@gmail.com \
--to=jaysoffian@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.