averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-23 12:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
c3f7d51bdafe6f87f38aaa355b2153bb78afc821
git-mirror/Documentation
History
Junio C Hamano 657072f3ac Merge branch 'jh/notes-merge' 
* jh/notes-merge: (23 commits)
  Provide 'git merge --abort' as a synonym to 'git reset --merge'
  cmd_merge(): Parse options before checking MERGE_HEAD
  Provide 'git notes get-ref' to easily retrieve current notes ref
  git notes merge: Add testcases for merging notes trees at different fanouts
  git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
  git notes merge: --commit should fail if underlying notes ref has moved
  git notes merge: List conflicting notes in notes merge commit message
  git notes merge: Manual conflict resolution, part 2/2
  git notes merge: Manual conflict resolution, part 1/2
  Documentation: Preliminary docs on 'git notes merge'
  git notes merge: Add automatic conflict resolvers (ours, theirs, union)
  git notes merge: Handle real, non-conflicting notes merges
  builtin/notes.c: Refactor creation of notes commits.
  git notes merge: Initial implementation handling trivial merges only
  builtin/notes.c: Split notes ref DWIMmery into a separate function
  notes.c: Use two newlines (instead of one) when concatenating notes
  (trivial) t3303: Indent with tabs instead of spaces for consistency
  notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
  notes.h/c: Allow combine_notes functions to remove notes
  notes.c: Reorder functions in preparation for next commit
  ...

Conflicts:
	builtin.h
2010-12-08 11:24:12 -08:00
..
howto
Merge branch 'jn/cherry-revert-message-clean-up'
2010-08-31 16:25:11 -07:00
pt_BR
Documentation: update pt-BR
2009-10-01 08:21:35 -04:00
RelNotes
Merge branch 'maint' to sync with Git 1.7.3.3
2010-12-03 15:23:55 -08:00
technical
Merge branch 'rs/opt-help-text'
2010-11-24 15:55:19 -08:00
.gitattributes
…
.gitignore
Documentation: Avoid use of xmlto --stringparam
2009-12-05 10:03:49 -08:00
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
Fix the building of gitman.info document
2008-12-29 00:40:10 -08:00
cmd-list.perl
…
CodingGuidelines
Merge branch 'sn/diff-doc'
2010-12-03 16:10:36 -08:00
config.txt
Merge branch 'jc/abbrev-guard'
2010-12-03 16:10:35 -08:00
date-formats.txt
Document date formats accepted by parse_date()
2009-12-03 12:41:37 -08:00
diff-format.txt
Fix typos in technical documentation.
2010-01-31 10:24:53 -08:00
diff-generate-patch.txt
Clarify and extend the "git diff" format documentation
2010-10-19 14:15:30 -07:00
diff-options.txt
Merge branch 'maint'
2010-11-17 13:57:58 -08:00
docbook-xsl.css
docbook: change css style
2009-04-06 00:27:09 -07:00
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
Merge branch 'mm/phrase-remote-tracking'
2010-11-24 15:55:05 -08:00
fix-texi.perl
…
git-add.txt
docs: give more hints about how "add -e" works
2010-11-09 16:37:40 -08:00
git-am.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-annotate.txt
Documentation: minor grammatical fixes.
2009-03-02 12:34:54 -08:00
git-apply.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-archimport.txt
Martin Langhoff has a new e-mail address
2010-10-06 12:08:48 -07:00
git-archive.txt
Use angles for placeholders consistently
2010-10-08 12:29:52 -07:00
git-bisect-lk2009.txt
Documentation: remove stray backslashes from "Fighting regressions" article
2010-08-20 14:16:51 -07:00
git-bisect.txt
Documentation: add "Fighting regressions with git bisect" article
2009-11-08 18:29:08 -08:00
git-blame.txt
blame: Add option to show author email instead of name
2010-10-19 12:00:28 -07:00
git-branch.txt
git-branch.txt: mention --set-upstream as a way to change upstream configuration
2010-11-03 09:20:48 -07:00
git-bundle.txt
Use angles for placeholders consistently
2010-10-08 12:29:52 -07:00
git-cat-file.txt
Documentation: gitrevisions is in section 7
2010-10-13 19:10:55 -07:00
git-check-attr.txt
Documentation: minor grammatical fixes in git-check-attr.txt
2009-03-22 21:02:38 -07:00
git-check-ref-format.txt
Documentation: gitrevisions is in section 7
2010-10-13 19:10:55 -07:00
git-checkout-index.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-checkout.txt
Change incorrect uses of "remote branch" meaning "remote-tracking"
2010-11-03 09:20:47 -07:00
git-cherry-pick.txt
Documentation: Fix mark-up of lines with more than one tilde
2010-12-02 11:30:35 -08:00
git-cherry.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-citool.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-clean.txt
Add -e/--exclude to git-clean.
2010-07-20 16:52:53 -07:00
git-clone.txt
Merge branch 'jl/clone-recurse-sm-synonym'
2010-11-29 17:52:34 -08:00
git-commit-tree.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-commit.txt
Merge branch 'pn/commit-autosquash'
2010-12-03 16:13:06 -08:00
git-config.txt
Merge remote branch 'remotes/trast-doc/for-next'
2010-01-20 20:28:49 -08:00
git-count-objects.txt
…
git-cvsexportcommit.txt
Martin Langhoff has a new e-mail address
2010-10-06 12:08:48 -07:00
git-cvsimport.txt
Documentation: spelling fixes
2010-07-20 16:59:17 -07:00
git-cvsserver.txt
Martin Langhoff has a new e-mail address
2010-10-06 12:08:48 -07:00
git-daemon.txt
daemon: make --inetd and --detach incompatible
2010-11-04 16:53:52 -07:00
git-describe.txt
Change incorrect uses of "remote branch" meaning "remote-tracking"
2010-11-03 09:20:47 -07:00
git-diff-files.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-diff-index.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-diff-tree.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-diff.txt
docs: clarify git diff modes of operation
2010-11-05 10:05:46 -07:00
git-difftool.txt
docs: clarify git diff modes of operation
2010-11-05 10:05:46 -07:00
git-fast-export.txt
Use angles for placeholders consistently
2010-10-08 12:29:52 -07:00
git-fast-import.txt
Merge branch 'maint'
2010-10-13 20:20:09 -07:00
git-fetch-pack.txt
Documentation: describe --thin more accurately
2010-02-18 17:13:18 -08:00
git-fetch.txt
Change "tracking branch" to "remote-tracking branch"
2010-11-03 09:20:41 -07:00
git-filter-branch.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-fmt-merge-msg.txt
merge: Make 'merge.log' an integer or boolean option
2010-09-09 11:39:23 -07:00
git-for-each-ref.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-format-patch.txt
Merge branch 'maint'
2010-10-13 20:20:09 -07:00
git-fsck-objects.txt
…
git-fsck.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-gc.txt
Change remote tracking to remote-tracking in non-trivial places
2010-11-03 09:19:08 -07:00
git-get-tar-commit-id.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-grep.txt
Documentation: add missing quotes to "git grep" examples
2010-08-20 14:16:21 -07:00
git-gui.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-hash-object.txt
Documentation: spelling fixes
2010-07-20 16:59:17 -07:00
git-help.txt
Work around em-dash handling in newer AsciiDoc
2010-08-24 09:48:20 -07:00
git-http-backend.txt
Documentation: Clarify support for smart HTTP backend
2010-03-30 16:49:19 -07:00
git-http-fetch.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-http-push.txt
Use 'fast-forward' all over the place
2009-10-24 23:50:28 -07:00
git-imap-send.txt
Merge branch 'rr/imap-send-unconfuse-from-line'
2010-04-03 12:28:42 -07:00
git-index-pack.txt
Use angles for placeholders consistently
2010-10-08 12:29:52 -07:00
git-init-db.txt
init-db: migrate to parse-options
2009-07-12 14:36:40 -07:00
git-init.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-instaweb.txt
Merge branch 'jc/maint-doc-em-dash'
2010-09-03 09:43:42 -07:00
git-log.txt
Replace "remote tracking" with "remote-tracking"
2010-11-03 09:19:04 -07:00
git-lost-found.txt
…
git-ls-files.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-ls-remote.txt
…
git-ls-tree.txt
Use angles for placeholders consistently
2010-10-08 12:29:52 -07:00
git-mailinfo.txt
git-mailinfo documentation: clarify -u/--encoding
2010-06-13 20:18:23 -07:00
git-mailsplit.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-merge-base.txt
merge-base --independent to print reduced parent list in a merge
2010-08-18 14:02:03 -07:00
git-merge-file.txt
merge-file: add option to select union merge favor
2010-03-02 21:16:45 -08:00
git-merge-index.txt
Documentation: remove backslashes in manpage synopses
2010-08-20 14:16:22 -07:00
git-merge-one-file.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-merge-tree.txt
Improve language in git-merge.txt and related docs
2008-12-09 20:57:52 -08:00
git-merge.txt
Merge branch 'jh/notes-merge'
2010-12-08 11:24:12 -08:00
git-mergetool--lib.txt
Work around em-dash handling in newer AsciiDoc
2010-08-24 09:48:20 -07:00
git-mergetool.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-mktag.txt
…
git-mktree.txt
mktree --batch: build more than one tree object
2009-05-16 10:28:59 -07:00
git-mv.txt
UI consistency: allow --force for where -f means force
2009-08-29 14:08:03 -07:00
git-name-rev.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01: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
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-pack-redundant.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-pack-refs.txt
doc/git-pack-refs: fix two grammar issues
2009-04-05 00:39:37 -07:00
git-parse-remote.txt
parse-remote: remove unused functions
2009-06-11 19:50:45 -07:00
git-patch-id.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-peek-remote.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-prune-packed.txt
prune-packed: migrate to parse-options
2009-07-10 23:57:21 -07:00
git-prune.txt
prune: allow --dry-run for -n and --verbose for -v
2010-08-09 10:13:18 -07:00
git-pull.txt
Merge branch 'maint' to sync with Git 1.7.3.3
2010-12-03 15:23:55 -08:00
git-push.txt
Documentation: gitrevisions is in section 7
2010-10-13 19:10:55 -07:00
git-quiltimport.txt
quiltimport documentation: --dry-run and -n are synonyms
2009-09-13 01:32:49 -07:00
git-read-tree.txt
read-tree: deprecate syntax without tree-ish args
2010-09-10 08:37:14 -07:00
git-rebase.txt
Merge branch 'jn/doc-backslash'
2010-09-03 09:43:42 -07:00
git-receive-pack.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-reflog.txt
Documentation: gitrevisions is in section 7
2010-10-13 19:10:55 -07:00
git-relink.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-remote-helpers.txt
Documentation/remote-helpers: Fix typos and improve language
2010-04-18 13:56:29 -07:00
git-remote.txt
Change "tracking branch" to "remote-tracking branch"
2010-11-03 09:20:41 -07:00
git-repack.txt
Merge branch 'jk/repack-reuse-object' into maint
2010-11-24 12:45:07 -08:00
git-replace.txt
Documentation: format full commands in typewriter font
2010-01-10 13:01:25 +01:00
git-repo-config.txt
…
git-request-pull.txt
request-pull.txt: Document -p option
2010-07-25 21:52:19 -07:00
git-rerere.txt
rerere.txt: Document forget subcommand
2010-07-05 11:51:20 -07:00
git-reset.txt
git-reset.txt: make modes description more consistent
2010-09-18 15:14:41 -07:00
git-rev-list.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-rev-parse.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-revert.txt
Documentation: Fix mark-up of lines with more than one tilde
2010-12-02 11:30:35 -08:00
git-rm.txt
git-rm.txt: Fix quoting
2010-12-07 13:13:21 -08:00
git-send-email.txt
git-send-email.perl: make initial In-Reply-To apply only to first email
2010-11-12 13:44:26 -08:00
git-send-pack.txt
Documentation: describe --thin more accurately
2010-02-18 17:13:18 -08:00
git-sh-setup.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-shell.txt
shell: Rewrite documentation and improve error message
2010-08-24 10:47:21 -07:00
git-shortlog.txt
Remove stray quotes in --pretty and --format documentation
2010-10-08 12:31:07 -07:00
git-show-branch.txt
Merge branch 'sn/doc-opt-notation' into maint
2010-10-21 16:26:42 -07:00
git-show-index.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-show-ref.txt
git-show-ref.txt: clarify the pattern matching
2010-10-19 14:15:30 -07:00
git-show.txt
Documentation: document show -s
2010-11-09 09:42:57 -08:00
git-stage.txt
Add a built-in alias for 'stage' to the 'add' command
2008-12-02 16:13:16 -08:00
git-stash.txt
detached-stash: update Documentation
2010-08-21 23:51:22 -07:00
git-status.txt
Submodules: Use "ignore" settings from .gitmodules too for diff and status
2010-08-09 09:11:44 -07:00
git-stripspace.txt
…
git-submodule.txt
git submodule add: Remove old docs about implicit -f
2010-07-19 11:11:07 -07:00
git-svn.txt
Use parentheses and `...' where appropriate
2010-10-08 12:31:07 -07:00
git-symbolic-ref.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-tag.txt
Change "tracking branch" to "remote-tracking branch"
2010-11-03 09:20:41 -07:00
git-tar-tree.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-tools.txt
…
git-unpack-file.txt
…
git-unpack-objects.txt
…
git-update-index.txt
Merge branch 'sn/doc-opt-notation' into maint
2010-10-21 16:26:42 -07:00
git-update-ref.txt
…
git-update-server-info.txt
Remove obsolete bug warning in man git-update-server-info
2009-04-25 09:29:38 -07:00
git-upload-archive.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-upload-pack.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-var.txt
Fix 'git var' usage synopsis
2010-02-14 18:23:16 -08:00
git-verify-pack.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-verify-tag.txt
verify-tag: document --verbose
2010-11-15 10:05:54 -08:00
git-web--browse.txt
Use angles for placeholders consistently
2010-10-08 12:29:52 -07:00
git-whatchanged.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git-write-tree.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
git.txt
Git 1.7.3.2
2010-10-21 17:14:32 -07:00
gitattributes.txt
Merge branch 'bc/fortran-userdiff'
2010-09-29 13:49:23 -07:00
gitcli.txt
Update "describe" documentation to match reality
2009-09-22 19:40:05 -07:00
gitcore-tutorial.txt
Documentation: gitrevisions is in section 7
2010-10-13 19:10:55 -07:00
gitcvs-migration.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
gitdiffcore.txt
gitdiffcore doc: update pickaxe description
2010-08-31 14:28:20 -07:00
gitglossary.txt
…
githooks.txt
notes: implement helpers needed for note copying during rewrite
2010-03-12 21:55:39 -08:00
gitignore.txt
Documentation: point to related commands from gitignore
2010-11-11 10:57:16 -08:00
gitk.txt
Documentation: gitrevisions is in section 7
2010-10-13 19:10:55 -07:00
gitmodules.txt
Typos in code comments, an error message, documentation
2010-08-22 13:26:13 -07: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
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
glossary-content.txt
Change "tracking branch" to "remote-tracking branch"
2010-11-03 09:20:41 -07:00
howto-index.sh
…
i18n.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
install-doc-quick.sh
…
install-webdoc.sh
install-webdoc: keep installed RelNotes-*.txt
2010-09-09 16:17:59 -07:00
mailmap.txt
Documentation: minor grammatical fixes in git-blame.txt.
2009-03-17 12:08:43 -07:00
Makefile
docs: fix Makefile dependency for user manual
2010-08-21 21:53:16 -07:00
manpage-1.72.xsl
Documentation: move quieting params into manpage-base.xsl
2009-03-27 00:33:19 -07:00
manpage-base-url.xsl.in
Documentation: Avoid use of xmlto --stringparam
2009-12-05 10:03:49 -08:00
manpage-base.xsl
Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set
2009-04-01 11:02:42 -07:00
manpage-bold-literal.xsl
Documentation: option to render literal text as bold for manpages
2009-03-27 00:33:20 -07:00
manpage-normal.xsl
Documentation: move "spurious .sp" code into manpage-base.xsl
2009-03-27 00:33:19 -07:00
manpage-quote-apos.xsl
Quote ' as \(aq in manpages
2009-10-22 12:59:50 -07:00
manpage-suppress-sp.xsl
Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set
2009-04-01 11:02:42 -07:00
merge-config.txt
Merge branch 'rr/fmt-merge-msg'
2010-09-29 13:48:20 -07:00
merge-options.txt
merge: Make '--log' an integer option for number of shortlog entries
2010-09-09 11:39:20 -07: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
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
rev-list-options.txt
Merge branch 'mm/phrase-remote-tracking'
2010-11-24 15:55:05 -08:00
revisions.txt
update comment and documentation for :/foo syntax
2010-09-27 10:54:52 -07:00
SubmittingPatches
SubmittingPatches: Document some extra tags used in commit messages
2010-10-06 13:45:42 -07:00
urls-remotes.txt
Documentation: spell 'git cmd' without dash throughout
2010-01-10 13:01:28 +01:00
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