global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-12 01:40:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/pull-to-integrate'

Browse Source 
* jk/pull-to-integrate:
  pull: change the description to "integrate" changes
  push: avoid suggesting "merging" remote changes
This commit is contained in:
Junio C Hamano
2013-07-12 12:04:06 -07:00
parent e70aee5c86 153d7265ef
commit 5b307e95e8
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-pull.sh
View File

@@ -5,7 +5,7 @@
# Fetch one or more remote refs and merge it/them into the current HEAD.
USAGE='[-n | --no-stat] [--[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.'
LONG_USAGE='Fetch one or more remote refs and integrate it/them with the current HEAD.'
SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
. git-sh-setup