{"thread":{"id":"10508","subject":"[PATCH] Teach git-pull about --[no-]ff, --no-squash and --commit","startedAt":"2007-10-29T08:41:18Z","lastAt":"2007-10-29T08:41:18Z","messageCount":1,"participants":["Lars Hjemli"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"57475","messageId":"1193647278-2616-1-git-send-email-hjemli@gmail.com","threadId":"10508","inReplyTo":null,"subject":"[PATCH] Teach git-pull about --[no-]ff, --no-squash and --commit","fromName":"Lars Hjemli","fromEmail":"hjemli@gmail.com","sentAt":"2007-10-29T08:41:18Z","receivedAt":"2007-10-29T08:41:18Z","isPatch":true,"sender":{"key":"hjemli@gmail.com","avatar":null},"body":"These options are supported by git-merge, but git-pull didn't know about\nthem.\n\nSigned-off-by: Lars Hjemli <hjemli@gmail.com>\n---\n git-pull.sh |   12 ++++++++++--\n 1 files changed, 10 insertions(+), 2 deletions(-)\n\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 74bfc16..39e5222 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -4,7 +4,7 @@\n #\n # Fetch one or more remote refs and merge it/them into the current HEAD.\n \n-USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <repo> <head>...'\n+USAGE='[-n | --no-summary] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...'\n LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'\n SUBDIRECTORY_OK=Yes\n . git-sh-setup\n@@ -27,8 +27,16 @@ do\n \t\t;;\n \t--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)\n \t\tno_commit=--no-commit ;;\n+\t--c|--co|--com|--comm|--commi|--commit)\n+\t\tno_commit=--commit ;;\n \t--sq|--squ|--squa|--squas|--squash)\n \t\tsquash=--squash ;;\n+\t--no-sq|--no-squ|--no-squa|--no-squas|--no-squash)\n+\t\tsquash=--no-squash ;;\n+\t--ff)\n+\t\tno_ff=--ff ;;\n+\t--no-ff)\n+\t\tno_ff=--no-ff ;;\n \t-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\\\n \t\t--strateg=*|--strategy=*|\\\n \t-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)\n@@ -133,5 +141,5 @@ then\n fi\n \n merge_name=$(git fmt-merge-msg <\"$GIT_DIR/FETCH_HEAD\") || exit\n-exec git-merge $no_summary $no_commit $squash $strategy_args \\\n+exec git-merge $no_summary $no_commit $squash $no_ff $strategy_args \\\n \t\"$merge_name\" HEAD $merge_head\n-- \n1.5.3.4.1404.g65af\n"}]}