admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ffc5e3c958b66fb4babeba01483cc924bc2957a5
git/Documentation
History
Junio C Hamano ffc5e3c958 Merge branch 'jc/merge-sans-branch' 
* jc/merge-sans-branch:
  merge: merge with the default upstream branch without argument
  merge: match the help text with the documentation

Conflicts:
	builtin/merge.c
2011-04-01 17:57:16 -07:00
..
howto
Documentation/merge subtree How-To: fix typo
2011-02-09 14:03:51 -08:00
pt_BR
…
RelNotes
Git 1.7.5-rc0
2011-03-31 13:58:47 -07:00
technical
Merge branch 'nd/index-doc' into maint
2011-04-01 16:23:55 -07:00
.gitattributes
…
.gitignore
…
asciidoc.conf
Merge branch 'jc/maint-doc-em-dash'
2010-09-03 09:43:42 -07:00
blame-options.txt
blame-options.txt: Add default value for -M/-C options.
2010-05-07 09:34:59 -07:00
build-docdep.perl
…
cat-texi.perl
…
cmd-list.perl
…
CodingGuidelines
CodingGuidelines: downcase placeholders in usage messages
2011-02-15 11:53:00 -08:00
config.txt
Merge branch 'jr/grep-en-config'
2011-04-01 17:56:27 -07:00
date-formats.txt
…
diff-format.txt
…
diff-generate-patch.txt
diff format documentation: clarify --cc and -c
2011-03-08 14:44:07 -08:00
diff-options.txt
diff: use "find" instead of "detect" as prefix for long forms of -M and -C
2010-12-10 13:52:05 -08:00
docbook-xsl.css
…
docbook.xsl
Documentation: set a !DOCTYPE for user manual
2010-08-20 10:53:56 -07:00
everyday.txt
everyday.txt: change "tracking branch" to "remote-tracking branch"
2010-11-03 09:19:10 -07:00
fetch-options.txt
pull: Document the "--[no-]recurse-submodules" options
2011-02-07 15:19:09 -08:00
fix-texi.perl
…
git-add.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-am.txt
Merge branch 'maint'
2011-03-22 14:56:13 -07:00
git-annotate.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-apply.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-archimport.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-archive.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-bisect-lk2009.txt
Documentation: remove stray backslashes from "Fighting regressions" article
2010-08-20 14:16:51 -07:00
git-bisect.txt
Merge branch 'mg/doc-bisect-tweak-worktree' into maint
2011-04-01 16:23:15 -07:00
git-blame.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-branch.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-bundle.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-cat-file.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-check-attr.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-check-ref-format.txt
Documentation: gitrevisions is in section 7
2010-10-13 19:10:55 -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
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-cherry-pick.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-cherry.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-citool.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-clean.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-clone.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-commit-tree.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-commit.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-config.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-count-objects.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-cvsexportcommit.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-cvsimport.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-cvsserver.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-daemon.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-describe.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-diff-files.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-diff-index.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-diff-tree.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-diff.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-difftool.txt
Merge branch 'ss/mergetool--lib'
2011-03-19 23:24:27 -07:00
git-fast-export.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-fast-import.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-fetch-pack.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-fetch.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-filter-branch.txt
Merge branch 'maint'
2011-04-01 17:45:59 -07:00
git-fmt-merge-msg.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-for-each-ref.txt
Add Author and Documentation sections to git-for-each-ref.txt
2011-03-09 12:22:15 -08:00
git-format-patch.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-fsck-objects.txt
doc: add missing git footers
2011-03-11 10:59:16 -05:00
git-fsck.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-gc.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-get-tar-commit-id.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-grep.txt
grep: allow -E and -n to be turned on by default via configuration
2011-03-30 13:17:07 -07:00
git-gui.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-hash-object.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-help.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-http-backend.txt
Documentation: Clarify support for smart HTTP backend
2010-03-30 16:49:19 -07:00
git-http-fetch.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-http-push.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-imap-send.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-index-pack.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-init-db.txt
doc: add missing git footers
2011-03-11 10:59:16 -05:00
git-init.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-instaweb.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-log.txt
Merge branch 'mg/rev-list-n-reverse-doc'
2011-03-19 23:25:32 -07:00
git-lost-found.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-ls-files.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-ls-remote.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-ls-tree.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-mailinfo.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-mailsplit.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-merge-base.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-merge-file.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-merge-index.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-merge-one-file.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-merge-tree.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-merge.txt
Merge branch 'jc/merge-sans-branch'
2011-04-01 17:57:16 -07:00
git-mergetool--lib.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-mergetool.txt
Merge branch 'ss/mergetool--lib'
2011-03-19 23:24:27 -07:00
git-mktag.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-mktree.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-mv.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-name-rev.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-notes.txt
Provide 'git notes get-ref' to easily retrieve current notes ref
2010-11-17 13:23:55 -08:00
git-pack-objects.txt
Merge branch 'maint'
2011-03-30 14:10:41 -07:00
git-pack-redundant.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-pack-refs.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-parse-remote.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-patch-id.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-peek-remote.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-prune-packed.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-prune.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-pull.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-push.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-quiltimport.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-read-tree.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-rebase.txt
Merge branch 'jk/doc-credits' of git://github.com/peff/git
2011-03-15 13:32:09 -07:00
git-receive-pack.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-reflog.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-relink.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-remote-ext.txt
Make <identifier> lowercase in Documentation
2011-02-17 11:49:54 -08:00
git-remote-fd.txt
Fix typos in the documentation
2011-01-04 11:23:42 -08:00
git-remote-helpers.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-remote.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-repack.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-replace.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-repo-config.txt
doc: add missing git footers
2011-03-11 10:59:16 -05:00
git-request-pull.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-rerere.txt
Merge branch 'js/rerere-forget-always-take-pathspec'
2011-03-19 23:24:48 -07:00
git-reset.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-rev-list.txt
Merge branch 'mg/rev-list-n-parents'
2011-03-26 20:13:17 -07:00
git-rev-parse.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-revert.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-rm.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-send-email.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-send-pack.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-sh-setup.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-shell.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-shortlog.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-show-branch.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-show-index.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-show-ref.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-show.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-stage.txt
doc: add missing git footers
2011-03-11 10:59:16 -05:00
git-stash.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-status.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-stripspace.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-submodule.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-svn.txt
doc: add missing git footers
2011-03-11 10:59:16 -05:00
git-symbolic-ref.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-tag.txt
Merge branch 'maint'
2011-03-28 14:17:17 -07:00
git-tar-tree.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-tools.txt
…
git-unpack-file.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-unpack-objects.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-update-index.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-update-ref.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-update-server-info.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-upload-archive.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-upload-pack.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-var.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-verify-pack.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-verify-tag.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-web--browse.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-whatchanged.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git-write-tree.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
git.txt
docs: point git.txt author credits to git-scm.com
2011-03-12 22:00:38 -05:00
gitattributes.txt
docs: fix grammar in gitattributes.txt
2011-03-18 09:58:47 -07:00
gitcli.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
gitcore-tutorial.txt
Documentation: gitrevisions is in section 7
2010-10-13 19:10:55 -07:00
gitcvs-migration.txt
…
gitdiffcore.txt
gitdiffcore doc: update pickaxe description
2010-08-31 14:28:20 -07:00
gitglossary.txt
…
githooks.txt
Documentation/githooks: post-rewrite-copy-notes never existed
2011-01-10 09:09:02 -08:00
gitignore.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
gitk.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
gitmodules.txt
doc: drop author/documentation sections from most pages
2011-03-11 10:59:16 -05:00
gitrepository-layout.txt
Documentation: spelling fixes
2010-07-20 16:59:17 -07:00
gitrevisions.txt
Documentation: gitrevisions
2010-07-05 13:39:02 -07:00
gittutorial-2.txt
Better "Changed but not updated" message in git-status
2010-11-03 09:18:58 -07:00
gittutorial.txt
Change remote tracking to remote-tracking in non-trivial places
2010-11-03 09:19:08 -07:00
gitworkflows.txt
…
glossary-content.txt
glossary: define pathspec
2011-02-03 13:22:58 -08:00
howto-index.sh
…
i18n.txt
…
install-doc-quick.sh
…
install-webdoc.sh
install-webdoc: keep installed RelNotes-*.txt
2010-09-09 16:17:59 -07:00
mailmap.txt
…
Makefile
docs: default to more modern toolset
2010-11-24 15:13:58 -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
Merge branch 'jc/merge-sans-branch'
2011-04-01 17:57:16 -07:00
merge-options.txt
merge: enable progress reporting for rename detection
2011-02-21 10:24:08 -08:00
merge-strategies.txt
Merge branch 'kb/merge-recursive-rename-threshold'
2010-10-26 21:54:04 -07:00
pretty-formats.txt
pretty: Introduce ' ' modifier to add space if non-empty
2010-06-16 14:45:09 -07:00
pretty-options.txt
Remove stray quotes in --pretty and --format documentation
2010-10-08 12:31:07 -07:00
pull-fetch-param.txt
…
rev-list-options.txt
Merge branch 'mg/rev-list-n-parents'
2011-03-26 20:13:17 -07:00
revisions.txt
Introduce CHERRY_PICK_HEAD
2011-02-21 22:58:02 -08:00
SubmittingPatches
SubmittingPatches: clarify the expected commit log description
2011-03-08 21:35:22 -08:00
urls-remotes.txt
…
urls.txt
Documentation: spelling fixes
2010-07-20 16:59:17 -07:00
user-manual.conf
…
user-manual.txt
user-manual: remote-tracking can be checked out, with detached HEAD
2010-11-03 09:20:48 -07:00