[PATCH 2/2] pull: document usage via OPTIONS_SPEC
flat view
DORMANTno replies
From: Jay Soffian <hidden>
Date: 2016-06-15 22:44:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
document usage via OPTIONS_SPEC Signed-off-by: Jay Soffian <redacted> --- 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