Junio C Hamano 6560584494 Merge branch 'jk/rebase-no-autostash' ...

There was no way to defeat a configured rebase.autostash variable
from the command line, as "git rebase --no-autostash" was missing.

* jk/rebase-no-autostash:
  Documentation/git-rebase: fix --no-autostash formatting
  rebase: support --no-autostash

2015-10-05 12:30:22 -07:00

..

howto

…

RelNotes

Update RelNotes to 2.6

2015-09-17 12:33:24 -07:00

technical

pack-protocol: clarify LF-handling in PKT-LINE()

2015-09-03 15:18:12 -07:00

.gitattributes

…

.gitignore

…

asciidoc.conf

…

blame-options.txt

Documentation/blame-options: don't list date formats

2015-09-03 15:34:39 -07:00

build-docdep.perl

…

cat-texi.perl

…

cmd-list.perl

…

CodingGuidelines

…

config.txt

Merge branch 'jk/date-local'

2015-10-05 12:30:13 -07:00

date-formats.txt

…

diff-config.txt

…

diff-format.txt

…

diff-generate-patch.txt

…

diff-options.txt

…

docbook-xsl.css

…

docbook.xsl

…

everyday.txto

…

fetch-options.txt

…

fix-texi.perl

…

fmt-merge-msg-config.txt

…

git-add.txt

…

git-am.txt

git-am: add am.threeWay config variable

2015-08-04 22:02:11 -07:00

git-annotate.txt

…

git-apply.txt

…

git-archimport.txt

…

git-archive.txt

…

git-bisect-lk2009.txt

…

git-bisect.txt

bisect: allow setting any user-specified in 'git bisect start'

2015-08-03 11:42:43 -07:00

git-blame.txt

…

git-branch.txt

Merge branch 'po/doc-branch-desc'

2015-09-17 12:29:03 -07:00

git-bundle.txt

…

git-cat-file.txt

…

git-check-attr.txt

…

git-check-ignore.txt

…

git-check-mailmap.txt

…

git-check-ref-format.txt

refs: loosen restriction on wildcard "*" refspecs

2015-07-27 09:21:31 -07:00

git-checkout-index.txt

…

git-checkout.txt

Merge branch 'se/doc-checkout-ours-theirs' into maint

2015-08-19 14:41:28 -07:00

git-cherry-pick.txt

…

git-cherry.txt

…

git-citool.txt

…

git-clean.txt

…

git-clone.txt

…

git-column.txt

…

git-commit-tree.txt

…

git-commit.txt

…

git-config.txt

config: add '--name-only' option to list only variable names

2015-08-10 10:33:58 -07:00

git-count-objects.txt

…

git-credential-cache--daemon.txt

…

git-credential-cache.txt

…

git-credential-store.txt

…

git-credential.txt

…

git-cvsexportcommit.txt

…

git-cvsimport.txt

…

git-cvsserver.txt

…

git-daemon.txt

…

git-describe.txt

Merge branch 'sg/describe-contains'

2015-08-31 15:39:10 -07:00

git-diff-files.txt

…

git-diff-index.txt

…

git-diff-tree.txt

…

git-diff.txt

…

git-difftool.txt

…

git-fast-export.txt

…

git-fast-import.txt

Merge branch 'mh/fast-import-get-mark'

2015-08-03 11:01:23 -07:00

git-fetch-pack.txt

…

git-fetch.txt

…

git-filter-branch.txt

…

git-fmt-merge-msg.txt

…

git-for-each-ref.txt

Merge branch 'kn/for-each-tag'

2015-10-05 12:30:18 -07:00

git-format-patch.txt

Merge branch 'po/doc-branch-desc'

2015-09-17 12:29:03 -07:00

git-fsck-objects.txt

…

git-fsck.txt

…

git-gc.txt

…

git-get-tar-commit-id.txt

…

git-grep.txt

…

git-gui.txt

…

git-hash-object.txt

…

git-help.txt

…

git-http-backend.txt

…

git-http-fetch.txt

…

git-http-push.txt

…

git-imap-send.txt

…

git-index-pack.txt

…

git-init-db.txt

…

git-init.txt

…

git-instaweb.txt

…

git-interpret-trailers.txt

…

git-log.txt

…

git-ls-files.txt

…

git-ls-remote.txt

…

git-ls-tree.txt

…

git-mailinfo.txt

…

git-mailsplit.txt

…

git-merge-base.txt

…

git-merge-file.txt

…

git-merge-index.txt

…

git-merge-one-file.txt

…

git-merge-tree.txt

…

git-merge.txt

Merge branch 'po/doc-branch-desc'

2015-09-17 12:29:03 -07:00

git-mergetool--lib.txt

…

git-mergetool.txt

…

git-mktag.txt

…

git-mktree.txt

…

git-mv.txt

…

git-name-rev.txt

…

git-notes.txt

notes: teach git-notes about notes.<name>.mergeStrategy option

2015-08-17 15:39:13 -07:00

git-p4.txt

…

git-pack-objects.txt

…

git-pack-redundant.txt

…

git-pack-refs.txt

…

git-parse-remote.txt

…

git-patch-id.txt

…

git-prune-packed.txt

…

git-prune.txt

…

git-pull.txt

…

git-push.txt

push: support signing pushes iff the server supports it

2015-08-19 12:58:45 -07:00

git-quiltimport.txt

git-quiltimport: add commandline option --series <file>

2015-09-01 11:10:07 -07:00

git-read-tree.txt

…

git-rebase.txt

Merge branch 'jk/rebase-no-autostash'

2015-10-05 12:30:22 -07:00

git-receive-pack.txt

…

git-reflog.txt

git-reflog: add exists command

2015-07-21 14:08:14 -07:00

git-relink.txt

…

git-remote-ext.txt

…

git-remote-fd.txt

…

git-remote-helpers.txto

…

git-remote-testgit.txt

…

git-remote.txt

…

git-repack.txt

…

git-replace.txt

…

git-request-pull.txt

doc: show usage of branch description

2015-09-14 12:50:33 -07:00

git-rerere.txt

…

git-reset.txt

…

git-rev-list.txt

Merge branch 'jk/date-local'

2015-10-05 12:30:13 -07:00

git-rev-parse.txt

…

git-revert.txt

…

git-rm.txt

…

git-send-email.txt

Merge branch 'jv/send-email-selective-smtp-auth'

2015-08-26 15:45:31 -07:00

git-send-pack.txt

push: support signing pushes iff the server supports it

2015-08-19 12:58:45 -07:00

git-sh-i18n--envsubst.txt

…

git-sh-i18n.txt

…

git-sh-setup.txt

…

git-shell.txt

…

git-shortlog.txt

…

git-show-branch.txt

…

git-show-index.txt

…

git-show-ref.txt

…

git-show.txt

…

git-stage.txt

…

git-stash.txt

stash: allow "stash show" diff output configurable

2015-08-31 11:29:04 -07:00

git-status.txt

…

git-stripspace.txt

…

git-submodule.txt

…

git-svn.txt

Merge branch 'br/svn-doc-include-paths-config' into maint

2015-09-17 12:11:46 -07:00

git-symbolic-ref.txt

…

git-tag.txt

tag.c: implement '--merged' and '--no-merged' options

2015-09-17 10:02:50 -07:00

git-tools.txt

Documentation/git-tools: retire manually-maintained list

2015-07-28 13:21:59 -07:00

git-unpack-file.txt

…

git-unpack-objects.txt

…

git-update-index.txt

…

git-update-ref.txt

update-ref and tag: add --create-reflog arg

2015-07-21 14:08:35 -07:00

git-update-server-info.txt

…

git-upload-archive.txt

…

git-upload-pack.txt

…

git-var.txt

…

git-verify-commit.txt

…

git-verify-pack.txt

…

git-verify-tag.txt

…

git-web--browse.txt

…

git-whatchanged.txt

…

git-worktree.txt

Documentation/git-worktree: fix duplicated 'from'

2015-08-05 12:57:14 -07:00

git-write-tree.txt

…

git.txt

Git 2.6

2015-09-28 13:18:19 -07:00

gitattributes.txt

userdiff: add support for Fountain documents

2015-07-23 14:44:51 -07:00

gitcli.txt

…

gitcore-tutorial.txt

…

gitcredentials.txt

…

gitcvs-migration.txt

…

gitdiffcore.txt

…

giteveryday.txt

…

gitglossary.txt

…

githooks.txt

…

gitignore.txt

…

gitk.txt

…

gitmodules.txt

…

gitnamespaces.txt

…

gitremote-helpers.txt

gitremote-helpers.txt: document pushcert option

2015-08-19 12:41:38 -07:00

gitrepository-layout.txt

Documentation/git-worktree: wordsmith worktree-related manpages

2015-07-20 11:07:18 -07:00

gitrevisions.txt

…

gittutorial-2.txt

…

gittutorial.txt

…

gitweb.conf.txt

Merge branch 'tf/gitweb-typofix'

2015-07-21 12:45:27 -07:00

gitweb.txt

…

gitworkflows.txt

…

glossary-content.txt

refs: make refs/bisect/* per-worktree

2015-09-01 10:37:39 -07:00

howto-index.sh

…

i18n.txt

…

install-doc-quick.sh

…

install-webdoc.sh

…

line-range-format.txt

…

mailmap.txt

…

Makefile

…

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

…

merge-options.txt

…

merge-strategies.txt

…

pretty-formats.txt

rev-list: make it obvious that we do not support notes

2015-08-24 10:33:15 -07:00

pretty-options.txt

rev-list: make it obvious that we do not support notes

2015-08-24 10:33:15 -07:00

pull-fetch-param.txt

…

rev-list-options.txt

Merge branch 'jk/date-local'

2015-10-05 12:30:13 -07:00

revisions.txt

…

sequencer.txt

…

SubmittingPatches

…

urls-remotes.txt

…

urls.txt

…

user-manual.conf

…

user-manual.txt

…