mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
bcd1ecd08a644a19adfebb31a72a4e608e077c6d
git/Documentation
History
Junio C Hamano bcd1ecd08a Merge branch 'jc/merge' 
"git merge FETCH_HEAD" learned that the previous "git fetch" could
be to create an Octopus merge, i.e. recording multiple branches
that are not marked as "not-for-merge"; this allows us to lose an
old style invocation "git merge <msg> HEAD $commits..." in the
implementation of "git pull" script; the old style syntax can now
be deprecated.

* jc/merge:
  merge: deprecate 'git merge <message> HEAD <commit>' syntax
  merge: handle FETCH_HEAD internally
  merge: decide if we auto-generate the message early in collect_parents()
  merge: make collect_parents() auto-generate the merge message
  merge: extract prepare_merge_message() logic out
  merge: narrow scope of merge_names
  merge: split reduce_parents() out of collect_parents()
  merge: clarify collect_parents() logic
  merge: small leakfix and code simplification
  merge: do not check argc to determine number of remote heads
  merge: clarify "pulling into void" special case
  t5520: test pulling an octopus into an unborn branch
  t5520: style fixes
  merge: simplify code flow
  merge: test the top-level merge driver
2015-05-19 13:17:57 -07:00
..
howto
howto: document more tools for recovery corruption
2015-04-01 22:44:03 -07:00
RelNotes
Sync with 2.4.1
2015-05-13 14:35:05 -07:00
technical
Merge branch 'jn/doc-api-errors'
2015-03-28 09:26:18 -07:00
.gitattributes
…
.gitignore
…
asciidoc.conf
…
blame-options.txt
Sync with 2.3.8
2015-05-11 14:39:28 -07:00
build-docdep.perl
…
cat-texi.perl
…
cmd-list.perl
…
CodingGuidelines
Merge branch 'jg/cguide-we-cannot-count' into maint
2015-04-21 12:12:19 -07:00
config.txt
Merge branch 'nd/multiple-work-trees'
2015-05-11 14:23:39 -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
Documentation: fix misuses of "nor"
2014-03-31 15:16:22 -07:00
diff-options.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
docbook-xsl.css
…
docbook.xsl
…
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
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-am.txt
Merge branch 'mm/am-c-doc' into maint
2015-03-06 14:57:56 -08:00
git-annotate.txt
…
git-apply.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-archimport.txt
…
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
…
git-cat-file.txt
cat-file: provide %(deltabase) batch format
2013-12-26 11:54:26 -08: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
…
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
…
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
Documentation: clarify how "git commit" cleans up the edited log message
2015-04-27 11:32:55 -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
…
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
…
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
…
git-diff-index.txt
…
git-diff-tree.txt
…
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
Merge branch 'mh/doc-remote-helper-xref'
2014-11-19 13:47:56 -08:00
git-fast-import.txt
Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint
2015-04-21 12:12:17 -07:00
git-fetch-pack.txt
Merge branch 'tb/doc-fetch-pack-url' into maint
2013-12-17 11:34:24 -08: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
…
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
…
git-fsck.txt
…
git-gc.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00
git-get-tar-commit-id.txt
…
git-grep.txt
grep: add grep.fullName config variable
2014-03-20 12:38:00 -07:00
git-gui.txt
…
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 commit 'doc/http-backend: missing accent grave in literal mark-up'
2014-04-09 11:45:04 -07:00
git-http-fetch.txt
…
git-http-push.txt
…
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
…
git-init-db.txt
…
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
…
git-mailinfo.txt
git-mailinfo: add --message-id
2014-11-25 15:24:55 -08:00
git-mailsplit.txt
…
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
…
git-merge-one-file.txt
…
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
…
git-mergetool.txt
mergetool: document the default for --[no-]prompt
2014-04-24 11:29:05 -07:00
git-mktag.txt
…
git-mktree.txt
…
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
pack-objects: use --objects-edge-aggressive for shallow repos
2014-12-29 09:58:25 -08:00
git-pack-redundant.txt
…
git-pack-refs.txt
Documentation: remove --prune from pack-refs examples
2013-07-18 16:23:46 -07:00
git-parse-remote.txt
…
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
Merge branch 'ss/pull-rebase-preserve'
2015-03-28 09:37:52 -07:00
git-push.txt
Merge branch 'ph/push-doc-cas' into maint
2015-03-31 14:52:24 -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
Sync with 2.3.5
2015-03-31 14:58:38 -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
…
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
…
git-remote-testgit.txt
…
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
rev-list: add an option to mark fewer edges as uninteresting
2014-12-29 09:57:55 -08:00
git-rev-parse.txt
setup.c: support multi-checkout repo setup
2014-12-01 11:00:15 -08: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
send-pack.c: add --atomic command line argument
2015-01-07 19:56:44 -08:00
git-sh-i18n--envsubst.txt
…
git-sh-i18n.txt
…
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-show-branch.txt
Documentation: fix misuses of "nor"
2014-03-31 15:16:22 -07:00
git-show-index.txt
…
git-show-ref.txt
Documentation: fix misuses of "nor"
2014-03-31 15:16:22 -07:00
git-show.txt
Documentation/git-show.txt: include common diff options, like git-log.txt
2013-07-17 17:50:56 -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 'mg/status-v-v'
2015-04-28 13:00:18 -07:00
git-stripspace.txt
Documentation/git-stripspace: add synopsis for --comment-lines
2014-12-04 14:18:30 -08:00
git-submodule.txt
submodule: improve documentation of update subcommand
2015-03-02 14:59:55 -08:00
git-svn.txt
Documentation: typofixes
2014-11-04 13:14:44 -08:00
git-symbolic-ref.txt
…
git-tag.txt
Merge branch 'nd/versioncmp-prereleases'
2015-04-28 13:00:19 -07:00
git-tools.txt
…
git-unpack-file.txt
…
git-unpack-objects.txt
Merge branch 'vd/doc-unpack-objects' into maint
2013-11-07 14:37:36 -08:00
git-update-index.txt
Merge branch 'po/doc-assume-unchanged'
2014-12-22 12:27:38 -08: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
…
git-upload-archive.txt
add uploadarchive.allowUnreachable option
2014-02-28 09:55:37 -08:00
git-upload-pack.txt
…
git-var.txt
…
git-verify-commit.txt
verify-commit: scriptable commit signature verification
2014-06-23 15:50:31 -07:00
git-verify-pack.txt
…
git-verify-tag.txt
…
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
…
git.txt
Sync with 2.4.1
2015-05-13 14:35:05 -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
doc: add 'everyday' to 'git help'
2014-10-10 16:02:26 -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
…
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
…
gitremote-helpers.txt
doc: add some crossrefs between manual pages
2014-11-11 14:47:04 -08:00
gitrepository-layout.txt
git-common-dir: make "modules/" per-working-directory directory
2014-12-01 11:00:19 -08:00
gitrevisions.txt
…
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
…
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
…
install-doc-quick.sh
…
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
…
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 'bc/asciidoc-pretty-formats-fix' into maint
2014-10-29 10:35:10 -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
…
SubmittingPatches
Merge branch 'jc/submitting-patches-mention-send-email' into maint
2015-03-28 09:33:10 -07:00
urls-remotes.txt
…
urls.txt
Merge branch 'ft/doc-git-transport' into maint
2013-07-21 22:51:24 -07:00
user-manual.conf
…
user-manual.txt
*config.txt: stick to camelCase naming convention
2015-03-13 22:13:46 -07:00