admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
eb2a8d9ed3fca2ba2f617b704992d483605f3bb6
git/Documentation
History
Paul Tan eb2a8d9ed3 pull: handle git-fetch's options as well 
While parsing the command-line arguments, git-pull stops parsing at the
first unrecognized option, assuming that any subsequent options are for
git-fetch, and can thus be kept in the shell's positional parameters
list, so that it can be passed to git-fetch via the expansion of "$@".

However, certain functions in git-pull assume that the positional
parameters do not contain any options:

* error_on_no_merge_candidates() uses the number of positional
  parameters to determine which error message to print out, and will
  thus print the wrong message if git-fetch's options are passed in as
  well.

* the call to get_remote_merge_branch() assumes that the positional
  parameters only contains the optional repo and refspecs, and will
  thus silently fail if git-fetch's options are passed in as well.

* --dry-run is a valid git-fetch option, but if provided after any
  git-fetch options, it is not recognized by git-pull and thus git-pull
  will continue to run the merge or rebase.

Fix these bugs by teaching git-pull to parse git-fetch's options as
well. Add tests to prevent regressions.

This removes the limitation where git-fetch's options have to come after
git-merge's and git-rebase's options on the command line. Update the
documentation to reflect this.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-06-02 13:36:22 -07:00
..
howto
command-list.txt: add the common groups block
2015-05-21 13:03:37 -07:00
RelNotes
Sixth batch for 2.5 cycle
2015-06-01 12:47:56 -07:00
technical
Merge branch 'fm/fetch-raw-sha1'
2015-06-01 12:45:19 -07:00
.gitattributes
…
.gitignore
doc: generate a list of valid merge tools
2013-02-02 21:46:52 -08:00
asciidoc.conf
Documentation: avoid poor-man's small caps GIT
2013-02-01 13:53:25 -08:00
blame-options.txt
Sync with 2.3.8
2015-05-11 14:39:28 -07:00
build-docdep.perl
…
cat-texi.perl
Documentation: Strip texinfo anchors to avoid duplicates
2013-04-03 16:14:19 -07:00
cmd-list.perl
command-list: prepare machinery for upcoming "common groups" section
2015-05-21 13:03:37 -07:00
CodingGuidelines
Merge branch 'jg/cguide-we-cannot-count' into maint
2015-04-21 12:12:19 -07:00
config.txt
Merge branch 'fm/fetch-raw-sha1'
2015-06-01 12:45:19 -07:00
date-formats.txt
Correct word usage of "timezone" in "Documentation" directory
2013-11-12 10:47:17 -08:00
diff-config.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
diff-format.txt
diff-format doc: a score can follow M for rewrite
2015-01-28 22:22:03 -08:00
diff-generate-patch.txt
doc: fix misrendering due to `single quote'
2015-05-12 22:13:39 -07:00
diff-options.txt
Merge branch 'mm/log-format-raw-doc'
2015-06-01 12:45:18 -07:00
docbook-xsl.css
…
docbook.xsl
Documentation: set a !DOCTYPE for user manual
2010-08-20 10:53:56 -07:00
everyday.txto
doc: add 'everyday' to 'git help'
2014-10-10 16:02:26 -07:00
fetch-options.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
fix-texi.perl
…
git-add.txt
Merge branch 'jk/asciidoc-markup-fix'
2015-05-22 12:41:50 -07:00
git-am.txt
Merge branch 'mm/am-c-doc' into maint
2015-03-06 14:57:56 -08:00
git-annotate.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-apply.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-archimport.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
git-archive.txt
docs: clarify remote restrictions for git-upload-archive
2014-02-28 09:55:35 -08:00
git-bisect-lk2009.txt
Documentation: typofixes
2014-11-04 13:14:44 -08:00
git-bisect.txt
Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
2014-05-21 13:57:10 -07:00
git-blame.txt
docs/git-blame: explain more clearly the example pickaxe use
2014-02-11 11:03:07 -08:00
git-branch.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-bundle.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
git-cat-file.txt
Merge branch 'dt/cat-file-follow-symlinks'
2015-06-01 12:45:16 -07:00
git-check-attr.txt
Merge branch 'jc/check-x-z'
2013-09-04 12:23:25 -07:00
git-check-ignore.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-check-mailmap.txt
builtin: add git-check-mailmap command
2013-07-13 10:19:37 -07:00
git-check-ref-format.txt
Add new @ shortcut for HEAD
2013-09-12 14:39:34 -07:00
git-checkout-index.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-checkout.txt
Merge branch 'nd/multiple-work-trees'
2015-05-11 14:23:39 -07:00
git-cherry-pick.txt
cherry-pick: fix docs describing handling of empty commits
2015-03-30 21:49:51 -07:00
git-cherry.txt
Documentation: revamp git-cherry(1)
2013-11-27 12:16:49 -08:00
git-citool.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-clean.txt
Merge branch 'mr/doc-clean-f-f' into maint
2015-03-13 22:56:12 -07:00
git-clone.txt
clone: --dissociate option to mark that reference is only temporary
2014-10-15 14:34:45 -07:00
git-column.txt
doc: remote author/documentation sections from more pages
2014-01-27 08:34:34 -08:00
git-commit-tree.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-commit.txt
Merge branch 'mc/commit-doc-grammofix'
2015-06-01 12:45:13 -07:00
git-config.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-count-objects.txt
Documentation: fix misuses of "nor"
2014-03-31 15:16:22 -07:00
git-credential-cache--daemon.txt
credential-cache: close stderr in daemon process
2014-09-16 11:11:58 -07:00
git-credential-cache.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
git-credential-store.txt
git-credential-store: support XDG_CONFIG_HOME
2015-03-24 08:08:02 -07:00
git-credential.txt
Documentation: make AsciiDoc links always point to HTML files
2013-09-06 14:49:06 -07:00
git-cvsexportcommit.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
git-cvsimport.txt
Documentation: typofixes
2014-11-04 13:14:44 -08:00
git-cvsserver.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-daemon.txt
Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
2014-05-21 13:57:10 -07:00
git-describe.txt
use 'commit-ish' instead of 'committish'
2013-09-04 15:03:03 -07:00
git-diff-files.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-diff-index.txt
Documentation/diff-index: mention two modes of operation
2013-05-20 15:50:44 -07:00
git-diff-tree.txt
docs: fix some antique example output
2011-05-26 22:15:39 -07:00
git-diff.txt
Documentation: fix misuses of "nor"
2014-03-31 15:16:22 -07:00
git-difftool.txt
difftool: add support for --trust-exit-code
2014-10-28 10:36:57 -07:00
git-fast-export.txt
doc: convert \--option to --option
2015-05-12 22:14:46 -07:00
git-fast-import.txt
doc: convert \--option to --option
2015-05-12 22:14:46 -07:00
git-fetch-pack.txt
doc: convert \--option to --option
2015-05-12 22:14:46 -07:00
git-fetch.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-filter-branch.txt
Documentation: typofixes
2014-11-04 13:14:44 -08:00
git-fmt-merge-msg.txt
documentation: trivial style cleanups
2013-05-17 12:09:21 -07:00
git-for-each-ref.txt
doc: remote author/documentation sections from more pages
2014-01-27 08:34:34 -08:00
git-format-patch.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-fsck-objects.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-fsck.txt
documentation: trivial style cleanups
2013-05-17 12:09:21 -07:00
git-gc.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-get-tar-commit-id.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-grep.txt
grep: add grep.fullName config variable
2014-03-20 12:38:00 -07:00
git-gui.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
git-hash-object.txt
git-hash-object.txt: document --literally option
2015-05-04 14:19:23 -07:00
git-help.txt
Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
2014-05-21 13:57:10 -07:00
git-http-backend.txt
Merge branch 'jk/http-backend-deadlock'
2015-06-01 12:45:09 -07:00
git-http-fetch.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
git-http-push.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-imap-send.txt
imap-send: use cURL automatically when NO_OPENSSL defined
2015-03-10 15:19:05 -07:00
git-index-pack.txt
clone: open a shortcut for connectivity check
2013-05-28 08:07:20 -07:00
git-init-db.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
git-init.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-instaweb.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-interpret-trailers.txt
Documentation: typofixes
2014-11-04 13:14:44 -08:00
git-log.txt
Sync with 2.3.8
2015-05-11 14:39:28 -07:00
git-ls-files.txt
Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
2014-05-21 13:57:10 -07:00
git-ls-remote.txt
ls-remote doc: don't encourage use of branches-file
2013-06-23 00:33:58 -07:00
git-ls-tree.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-mailinfo.txt
git-mailinfo: add --message-id
2014-11-25 15:24:55 -08:00
git-mailsplit.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-merge-base.txt
merge-base: teach "--fork-point" mode
2013-10-29 13:06:08 -07:00
git-merge-file.txt
Documentation/git-merge-file: document option "--diff3"
2013-08-09 14:19:59 -07:00
git-merge-index.txt
The name of the hash function is "SHA-1", not "SHA1"
2013-04-15 11:08:37 -07:00
git-merge-one-file.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-merge-tree.txt
use 'tree-ish' instead of 'treeish'
2013-09-04 15:02:56 -07:00
git-merge.txt
Merge branch 'jc/merge'
2015-05-19 13:17:57 -07:00
git-mergetool--lib.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
git-mergetool.txt
mergetool: document the default for --[no-]prompt
2014-04-24 11:29:05 -07:00
git-mktag.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
git-mktree.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-mv.txt
mv: better document side effects when moving a submodule
2014-01-07 14:33:04 -08:00
git-name-rev.txt
use 'commit-ish' instead of 'committish'
2013-09-04 15:03:03 -07:00
git-notes.txt
builtin/notes: add --allow-empty, to allow storing empty notes
2014-11-12 11:00:11 -08:00
git-p4.txt
git-p4: use -m when running p4 changes
2015-04-20 12:36:00 -07:00
git-pack-objects.txt
doc: convert \--option to --option
2015-05-12 22:14:46 -07:00
git-pack-redundant.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-pack-refs.txt
Documentation: remove --prune from pack-refs examples
2013-07-18 16:23:46 -07:00
git-parse-remote.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-patch-id.txt
patch-id: make it stable against hunk reordering
2014-06-10 13:09:24 -07:00
git-prune-packed.txt
Documentation: adjust document title underlining
2014-10-13 13:35:18 -07:00
git-prune.txt
prune: strategies for linked checkouts
2014-12-01 11:00:17 -08:00
git-pull.txt
pull: handle git-fetch's options as well
2015-06-02 13:36:22 -07:00
git-push.txt
Merge branch 'jk/asciidoc-markup-fix'
2015-05-22 12:41:50 -07:00
git-quiltimport.txt
Documentation: adjust document title underlining
2014-10-13 13:35:18 -07:00
git-read-tree.txt
Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
2014-05-21 13:57:10 -07:00
git-rebase.txt
Merge branch 'jk/asciidoc-markup-fix'
2015-05-22 12:41:50 -07:00
git-receive-pack.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-reflog.txt
reflog_expire(): ignore --updateref for symbolic references
2015-03-05 12:35:37 -08:00
git-relink.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-remote-ext.txt
doc: add some crossrefs between manual pages
2014-11-11 14:47:04 -08:00
git-remote-fd.txt
doc: add some crossrefs between manual pages
2014-11-11 14:47:04 -08:00
git-remote-helpers.txto
Rename {git- => git}remote-helpers.txt
2013-02-01 14:12:34 -08:00
git-remote-testgit.txt
Merge branch 'jk/remote-helpers-doc'
2013-02-07 14:41:45 -08:00
git-remote.txt
Merge branch 'mg/doc-remote-tags-or-not' into maint
2015-03-13 22:56:05 -07:00
git-repack.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-replace.txt
Merge branch 'cc/replace-graft'
2014-07-27 15:14:18 -07:00
git-request-pull.txt
request-pull: documentation updates
2014-03-13 14:22:20 -07:00
git-rerere.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-reset.txt
Merge branch 'jl/nor-or-nand-and'
2014-04-08 12:00:28 -07:00
git-rev-list.txt
doc: convert \--option to --option
2015-05-12 22:14:46 -07:00
git-rev-parse.txt
Merge branch 'jk/asciidoc-markup-fix'
2015-05-22 12:41:50 -07:00
git-revert.txt
parse-options: multi-word argh should use dash to separate words
2014-03-24 10:43:34 -07:00
git-rm.txt
rm: better document side effects when removing a submodule
2014-01-07 14:34:06 -08:00
git-send-email.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-send-pack.txt
Merge branch 'jk/asciidoc-markup-fix'
2015-05-22 12:41:50 -07:00
git-sh-i18n--envsubst.txt
correct a few doubled-word nits in comments and documentation
2012-03-28 11:18:35 -07:00
git-sh-i18n.txt
Merge branch 'jn/doc-dashdash' into maint
2011-09-11 21:52:18 -07:00
git-sh-setup.txt
Merge branch 'jc/reflog-doc'
2013-10-18 13:50:12 -07:00
git-shell.txt
shell doc: remove stray "+" in example
2014-05-08 10:26:26 -07:00
git-shortlog.txt
git-shortlog.txt: make SYNOPSIS match log, update OPTIONS
2013-04-21 23:11:02 -07:00
git-show-branch.txt
Documentation: fix misuses of "nor"
2014-03-31 15:16:22 -07:00
git-show-index.txt
The name of the hash function is "SHA-1", not "SHA1"
2013-04-15 11:08:37 -07:00
git-show-ref.txt
Documentation: fix misuses of "nor"
2014-03-31 15:16:22 -07:00
git-show.txt
doc: convert \--option to --option
2015-05-12 22:14:46 -07:00
git-stage.txt
Documentation: adjust document title underlining
2014-10-13 13:35:18 -07:00
git-stash.txt
stash doc: mention short form -k in save description
2014-02-24 09:13:30 -08:00
git-status.txt
Merge branch 'nd/untracked-cache'
2015-05-26 13:24:46 -07:00
git-stripspace.txt
Merge branch 'jk/stripspace-asciidoctor-fix'
2015-05-22 12:41:49 -07:00
git-submodule.txt
submodule: improve documentation of update subcommand
2015-03-02 14:59:55 -08:00
git-svn.txt
doc: put example URLs and emails inside literal backticks
2015-05-12 22:14:46 -07:00
git-symbolic-ref.txt
git symbolic-ref --delete $symref
2012-10-21 12:17:38 -07:00
git-tag.txt
Merge branch 'jk/asciidoc-markup-fix'
2015-05-22 12:41:50 -07:00
git-tools.txt
doc: various spelling fixes
2013-04-12 12:00:52 -07:00
git-unpack-file.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-unpack-objects.txt
doc: fix inconsistent spelling of "packfile"
2015-05-22 09:00:17 -07:00
git-update-index.txt
update-index: test the system before enabling untracked cache
2015-03-12 13:45:18 -07:00
git-update-ref.txt
update-ref --stdin -z: deprecate interpreting the empty string as zeros
2014-04-07 12:09:13 -07:00
git-update-server-info.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git-upload-archive.txt
add uploadarchive.allowUnreachable option
2014-02-28 09:55:37 -08:00
git-upload-pack.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
git-var.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
git-verify-commit.txt
verify-commit: scriptable commit signature verification
2014-06-23 15:50:31 -07:00
git-verify-pack.txt
git-verify-pack.txt: fix inconsistent spelling of "packfile"
2015-05-17 11:24:57 -07:00
git-verify-tag.txt
The name of the hash function is "SHA-1", not "SHA1"
2013-04-15 11:08:37 -07:00
git-web--browse.txt
Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
2014-05-21 13:57:10 -07:00
git-whatchanged.txt
whatchanged: document its historical nature
2013-08-13 09:01:54 -07:00
git-write-tree.txt
Documentation: use [verse] for SYNOPSIS sections
2011-07-06 14:26:26 -07:00
git.txt
Sync with 2.4.2
2015-05-26 13:50:51 -07:00
gitattributes.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
gitcli.txt
Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
2014-05-21 13:57:10 -07:00
gitcore-tutorial.txt
Merge branch 'ja/tutorial-asciidoctor-fix'
2015-05-22 12:41:48 -07:00
gitcredentials.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
gitcvs-migration.txt
doc: add 'everyday' to 'git help'
2014-10-10 16:02:26 -07:00
gitdiffcore.txt
doc: convert \--option to --option
2015-05-12 22:14:46 -07:00
giteveryday.txt
doc: add 'everyday' to 'git help'
2014-10-10 16:02:26 -07:00
gitglossary.txt
doc: add 'everyday' to 'git help'
2014-10-10 16:02:26 -07:00
githooks.txt
receive-pack: support push-to-checkout hook
2015-01-08 14:28:43 -08:00
gitignore.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
gitk.txt
Documentation: change -L:<regex> to -L:<funcname>
2015-04-20 11:05:50 -07:00
gitmodules.txt
submodule: improve documentation of update subcommand
2015-03-02 14:59:55 -08:00
gitnamespaces.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
gitremote-helpers.txt
doc: drop backslash quoting of some curly braces
2015-05-12 22:14:46 -07:00
gitrepository-layout.txt
git-common-dir: make "modules/" per-working-directory directory
2014-12-01 11:00:19 -08:00
gitrevisions.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
gittutorial-2.txt
Merge branch 'sn/tutorial-status-output-example'
2014-11-19 13:47:59 -08:00
gittutorial.txt
Merge branch 'sn/tutorial-status-output-example'
2014-11-19 13:47:59 -08:00
gitweb.conf.txt
Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-21 12:12:22 -07:00
gitweb.txt
Documentation: fix documentation AsciiDoc links for external urls
2014-02-20 14:14:58 -08:00
gitworkflows.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
glossary-content.txt
Documentation: typofixes
2014-11-04 13:14:44 -08:00
howto-index.sh
howto-index.sh: use the $( ... ) construct for command substitution
2014-04-17 11:14:57 -07:00
i18n.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
install-doc-quick.sh
docs: Update install-doc-quick
2011-11-08 13:37:10 -08:00
install-webdoc.sh
install-webdoc.sh: use the $( ... ) construct for command substitution
2014-04-17 11:14:58 -07:00
line-range-format.txt
Documentation: change -L:<regex> to -L:<funcname>
2015-04-20 11:05:50 -07:00
mailmap.txt
Merge branch 'jk/mailmap-from-blob'
2013-01-05 23:41:42 -08:00
Makefile
Documentation: fix version numbering
2015-01-22 13:44:14 -08:00
manpage-1.72.xsl
…
manpage-base-url.xsl.in
…
manpage-base.xsl
…
manpage-bold-literal.xsl
…
manpage-normal.xsl
…
manpage-quote-apos.xsl
…
manpage-suppress-sp.xsl
…
merge-config.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
merge-options.txt
Documentation: fix misuses of "nor"
2014-03-31 15:16:22 -07:00
merge-strategies.txt
Merge branch 'rr/doc-merge-strategies' into maint
2014-04-03 13:39:03 -07:00
pretty-formats.txt
Merge branch 'mm/log-format-raw-doc'
2015-06-01 12:45:18 -07:00
pretty-options.txt
"log --pretty" documentation: do not forget "tformat:"
2015-01-15 17:38:58 -08:00
pull-fetch-param.txt
docs: Explain the purpose of fetch's and pull's <refspec> parameter.
2014-06-12 09:59:13 -07:00
rev-list-options.txt
Merge branch 'mg/show-notes-doc'
2015-04-28 13:00:20 -07:00
revisions.txt
Documentation: mention config sources for @{upstream}
2014-05-13 12:35:00 -07:00
sequencer.txt
revert: introduce --abort to cancel a failed cherry-pick
2011-11-22 18:16:59 -08:00
SubmittingPatches
Merge branch 'jc/submitting-patches-mention-send-email' into maint
2015-03-28 09:33:10 -07:00
urls-remotes.txt
Documentation: the name of the system is 'Git', not 'git'
2013-02-01 13:53:33 -08:00
urls.txt
Merge branch 'ft/doc-git-transport' into maint
2013-07-21 22:51:24 -07:00
user-manual.conf
docs: monospace listings in docbook output
2012-08-07 14:30:52 -07:00
user-manual.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00