mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 12:03:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
443259cf92
git/Documentation
History
Johan Herland 6abb3655ef git notes merge: Manual conflict resolution, part 2/2 
When the notes merge conflicts in .git/NOTES_MERGE_WORKTREE have been
resolved, we need to record a new notes commit on the appropriate notes
ref with the resolved notes.

This patch implements 'git notes merge --commit' which the user should
run after resolving conflicts in the notes merge worktree. This command
finalizes the notes merge by recombining the partial notes tree from
part 1 with the now-resolved conflicts in the notes merge worktree in a
merge commit, and updating the appropriate ref to this merge commit.

In order to correctly finalize the merge, we need to keep track of three
things:

- The partial merge result from part 1, containing the auto-merged notes.
  This is now stored into a ref called .git/NOTES_MERGE_PARTIAL.
- The unmerged notes. These are already stored in
  .git/NOTES_MERGE_WORKTREE, thanks to part 1.
- The notes ref to be updated by the finalized merge result. This is now
  stored in a symref called .git/NOTES_MERGE_REF.

In addition to "git notes merge --commit", which uses the above details
to create the finalized notes merge commit, this patch also implements
"git notes merge --reset", which aborts the ongoing notes merge by simply
removing the files/directory described above.

FTR, "git notes merge --commit" reuses "git notes merge --reset" to remove
the information described above (.git/NOTES_MERGE_*) after the notes merge
have been successfully finalized.

The patch also contains documentation and testcases for the two new options.

This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Fix nonsense sentence in --commit description
- Sverre Rabbelier: Rename --reset to --abort

Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks-to: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-17 13:22:49 -08:00
..
howto Teach rebase the --no-ff option. 2010-03-24 14:42:57 -07:00
pt_BR Documentation: update pt-BR 2009-10-01 08:21:35 -04:00
technical Merge branch 'maint' 2010-07-11 23:47:29 -07:00
.gitattributes Define the project whitespace policy 2008-02-11 13:23:15 -08:00
.gitignore Documentation: Avoid use of xmlto --stringparam 2009-12-05 10:03:49 -08:00
asciidoc.conf git-submodule documentation: fix foreach example 2009-06-30 11:17:54 -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 Documentation: rename gitlink macro to linkgit 2008-01-06 18:41:44 -08:00
CodingGuidelines lstat_cache(): swap func(length, string) into func(string, length) 2009-02-09 20:59:26 -08:00
config.txt Document receive.denyDeleteCurrent 2010-07-25 23:14:19 -07: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 git log -p -m: document -m and honor --first-parent 2010-02-12 11:32:23 -08:00
diff-options.txt Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C 2010-08-09 09:16:11 -07:00
docbook-xsl.css docbook: change css style 2009-04-06 00:27:09 -07:00
docbook.xsl Mark user-manual as UTF-8 2007-07-24 00:47:05 -07:00
everyday.txt everyday: fsck and gc are not everyday operations 2010-03-16 19:25:20 -07:00
fetch-options.txt git fetch documentation: describe short '-p' synonym to '--prune' option 2010-07-13 09:13:34 -07:00
fix-texi.perl Add support for an info version of the user manual 2007-08-10 23:16:18 -07:00
git-add.txt git add: Add --ignore-missing to SYNOPSIS 2010-07-19 11:11:46 -07:00
git-am.txt Merge branch 'sh/am-keep-cr' 2010-03-10 15:32:34 -08:00
git-annotate.txt Documentation: minor grammatical fixes. 2009-03-02 12:34:54 -08:00
git-apply.txt Documentation: cite git-am from git-apply 2010-08-09 09:15:41 -07:00
git-archimport.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-archive.txt archive documentation: attributes are taken from the tree by default 2010-02-12 09:38:20 -08:00
git-bisect-lk2009.txt Fix typos in technical documentation. 2010-01-31 10:24:53 -08:00
git-bisect.txt Documentation: add "Fighting regressions with git bisect" article 2009-11-08 18:29:08 -08:00
git-blame.txt Merge remote branch 'remotes/trast-doc/for-next' 2010-01-20 20:28:49 -08:00
git-branch.txt Merge branch 'maint' 2010-04-17 12:40:45 -07:00
git-bundle.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-cat-file.txt Documentation: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -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: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -07:00
git-checkout-index.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-checkout.txt Merge branch 'maint' 2010-07-11 23:47:29 -07:00
git-cherry-pick.txt Documentation: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -07: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 git-clean: fix the description of the default behavior 2010-02-04 15:12:13 -08:00
git-clone.txt Sync with Git 1.7.0.3 2010-03-21 17:03:57 -07:00
git-commit-tree.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-commit.txt Merge branch 'maint' 2010-06-07 15:46:01 -07:00
git-config.txt Merge remote branch 'remotes/trast-doc/for-next' 2010-01-20 20:28:49 -08:00
git-count-objects.txt count-objects: Add total pack size to verbose output 2008-08-17 01:01:42 -07:00
git-cvsexportcommit.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-cvsimport.txt cvsimport: new -R option: generate .git/cvs-revisions mapping 2010-02-06 11:01:59 -08:00
git-cvsserver.txt Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
git-daemon.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-describe.txt Documentation: explain the meaning of "-g" in git-describe output 2010-03-24 11:31:45 -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 Documentation: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -07:00
git-difftool.txt Merge remote branch 'remotes/trast-doc/for-next' 2010-01-20 20:28:49 -08:00
git-fast-export.txt Fix typos in technical documentation. 2010-01-31 10:24:53 -08:00
git-fast-import.txt Documentation: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -07:00
git-fetch-pack.txt Documentation: describe --thin more accurately 2010-02-18 17:13:18 -08:00
git-fetch.txt fetch/push: fix usage strings 2010-04-09 21:23:10 -07:00
git-filter-branch.txt docs: fix filter-branch example for quoted paths 2010-02-06 10:52:14 -08:00
git-fmt-merge-msg.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-for-each-ref.txt for-each-ref: Field with abbreviated objectname 2010-05-18 21:49:04 -07:00
git-format-patch.txt Documentation: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -07:00
git-fsck-objects.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-fsck.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-gc.txt Merge branch 'maint' 2010-07-05 11:56:53 -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 Merge branch 'jn/grep-open' 2010-06-30 11:55:38 -07:00
git-gui.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-hash-object.txt hash-object: support --stdin-paths with --no-filters 2010-03-05 02:57:54 -08:00
git-help.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01: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 Documentation: describe --thin more accurately 2010-02-18 17:13:18 -08:00
git-init-db.txt init-db: migrate to parse-options 2009-07-12 14:36:40 -07:00
git-init.txt Add a "TEMPLATE DIRECTORY" section to git-init[1]. 2010-02-17 12:17:53 -08:00
git-instaweb.txt git-instaweb: Add support for running gitweb via 'plackup' 2010-06-02 11:54:06 -07:00
git-log.txt Merge branch 'eb/doc-log-manpage' 2010-07-15 12:07:56 -07:00
git-lost-found.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-ls-files.txt Document ls-files -t as semi-obsolete. 2010-07-28 13:56:45 -07:00
git-ls-remote.txt Update my e-mail address 2008-08-01 23:21:44 -07:00
git-ls-tree.txt Documentation: format full commands in typewriter font 2010-01-10 13:01:25 +01:00
git-mailinfo.txt git-mailinfo documentation: clarify -u/--encoding 2010-06-13 20:18:23 -07:00
git-mailsplit.txt documentation: 'git-mailsplit --keep-cr' is not hidden anymore 2010-02-28 11:04:19 -08:00
git-merge-base.txt git-merge-base/git-show-branch --merge-base: Documentation and test 2009-08-05 10:29:37 -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: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01: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: --log appends shortlog to message if specified 2010-05-10 12:02:20 -07:00
git-mergetool--lib.txt mergetool--lib: simplify API usage by removing more global variables 2009-04-12 15:19:12 -07:00
git-mergetool.txt Documentation: Explain git-mergetool's use of temporary files 2010-07-19 09:16:09 -07:00
git-mktag.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
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 git notes merge: Manual conflict resolution, part 2/2 2010-11-17 13:22:49 -08:00
git-pack-objects.txt pack-objects documentation: Fix --honor-pack-keep as well. 2010-02-24 19:10:22 -08: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 docs: don't talk about $GIT_DIR/refs/ everywhere 2010-02-17 21:40:09 -08:00
git-pull.txt fetch and pull: learn --progress 2010-02-24 08:35:45 -08:00
git-push.txt Documentation/git-push: Explain status output in more detail 2010-07-25 23:14:19 -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 git-read-tree.txt: acknowledge the directory matching bug in sparse checkout 2010-07-25 23:14:18 -07:00
git-rebase.txt rebase -i -p: document shortcomings 2010-06-11 08:44:13 -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: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -07:00
git-relink.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -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 Merge branch 'jn/remote-set-branches' 2010-06-18 11:16:55 -07:00
git-repack.txt update git-repack documentation wrt repack.UseDeltaBaseOffset 2010-02-04 15:12:16 -08:00
git-replace.txt Documentation: format full commands in typewriter font 2010-01-10 13:01:25 +01:00
git-repo-config.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
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 Documentation: improve description of "git reset --keep" 2010-03-08 18:16:05 -08:00
git-rev-list.txt Merge branch 'il/rev-glob' 2010-02-23 12:05:18 -08:00
git-rev-parse.txt Documentation/rev-parse: quoting is required with --parseopt 2010-08-02 09:11:28 -07:00
git-revert.txt Documentation: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -07:00
git-rm.txt git-rm doc: Describe how to sync index & work tree 2010-01-07 15:37:33 -08:00
git-send-email.txt Merge branch 'tr/send-email-8bit' into maint 2010-06-28 16:19:03 -07: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 git-shell: Add 'git-upload-archive' to allowed commands. 2009-04-11 11:01:15 -07:00
git-shortlog.txt shortlog: Document and test --format option 2010-05-04 15:30:59 -07:00
git-show-branch.txt Documentation: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -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 Documentation: show-ref <pattern>s are optional 2010-03-31 14:22:17 -07:00
git-show.txt Documentation: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -07: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 docs: don't talk about $GIT_DIR/refs/ everywhere 2010-02-17 21:40:09 -08:00
git-status.txt Merge branch 'jl/status-ignore-submodules' 2010-06-30 11:55:39 -07:00
git-stripspace.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-submodule.txt git submodule add: Remove old docs about implicit -f 2010-07-19 11:11:07 -07:00
git-svn.txt git-svn documentation: minor grammar fix 2010-05-09 01:25:18 -07:00
git-symbolic-ref.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-tag.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-tar-tree.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-tools.txt Remove outdated references to cogito in documentation 2007-10-29 12:53:50 -07:00
git-unpack-file.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-unpack-objects.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-update-index.txt Documentation: git-add does not update files marked "assume unchanged" 2010-05-08 11:12:28 -07:00
git-update-ref.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
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 Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
git-web--browse.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01: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 Documentation: reporting bugs 2010-08-02 09:07:39 -07:00
gitattributes.txt Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
gitcli.txt Update "describe" documentation to match reality 2009-09-22 19:40:05 -07:00
gitcore-tutorial.txt Documentation: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -07:00
gitcvs-migration.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
gitdiffcore.txt Documentation/gitdiffcore: fix order in pickaxe description 2010-05-18 21:55:11 -07:00
gitglossary.txt Documentation: fix links to "everyday.html" 2008-11-14 21:48:10 -08:00
githooks.txt notes: implement helpers needed for note copying during rewrite 2010-03-12 21:55:39 -08:00
gitignore.txt gitignore.5: Clarify matching rules 2010-05-31 18:11:10 -07:00
gitk.txt Documentation: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -07:00
gitmodules.txt gitmodules.5: url can be a relative path 2010-07-15 11:59:57 -07:00
gitrepository-layout.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
gitrevisions.txt Documentation: gitrevisions 2010-07-05 13:39:02 -07:00
gittutorial-2.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
gittutorial.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
gitworkflows.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
glossary-content.txt Use 'fast-forward' all over the place 2009-10-24 23:50:28 -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-doc-quick - use git --exec-path to find git-sh-setup 2008-07-08 16:36:03 -07:00
install-webdoc.sh Do not use "diff" found on PATH while building and installing 2010-05-31 16:59:27 -07:00
mailmap.txt Documentation: minor grammatical fixes in git-blame.txt. 2009-03-17 12:08:43 -07:00
Makefile Documentation: gitrevisions 2010-07-05 13:39:02 -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 mergetool--lib: add p4merge as a pre-configured mergetool option 2009-10-28 16:48:20 -07:00
merge-options.txt Merge branch 'maint' 2010-04-13 18:21:29 -07:00
merge-strategies.txt Document that merge strategies can now take their own options 2010-01-17 22:46:28 -08:00
pretty-formats.txt pretty: Introduce ' ' modifier to add space if non-empty 2010-06-16 14:45:09 -07:00
pretty-options.txt pretty-options.txt: match --format's documentation with implementation. 2010-08-05 09:49:49 -07:00
pull-fetch-param.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
RelNotes-1.5.0.1.txt
RelNotes-1.5.0.2.txt
RelNotes-1.5.0.3.txt
RelNotes-1.5.0.4.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.5.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.6.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.7.txt GIT 1.5.0.7 2007-04-03 19:27:41 -07:00
RelNotes-1.5.0.txt
RelNotes-1.5.1.1.txt git-svn: don't allow globs to match regular files 2007-04-18 12:39:04 -07:00
RelNotes-1.5.1.2.txt GIT 1.5.1.2 2007-04-21 13:57:07 -07:00
RelNotes-1.5.1.3.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.1.4.txt GIT v1.5.1.4 2007-05-08 22:11:17 -07:00
RelNotes-1.5.1.5.txt GIT 1.5.1.6 2007-05-20 00:15:53 -07:00
RelNotes-1.5.1.6.txt GIT 1.5.1.6 2007-05-20 00:15:53 -07:00
RelNotes-1.5.1.txt GIT 1.5.1 2007-04-03 22:47:01 -07:00
RelNotes-1.5.2.1.txt GIT 1.5.2.1 2007-06-02 16:02:49 -07:00
RelNotes-1.5.2.2.txt Documentation: Typos / spelling fixes in RelNotes 2009-03-03 21:40:36 -08:00
RelNotes-1.5.2.3.txt GIT 1.5.2.3 2007-07-02 00:35:58 -07:00
RelNotes-1.5.2.4.txt GIT 1.5.2.4 2007-07-12 12:01:47 -07:00
RelNotes-1.5.2.5.txt GIT 1.5.2.5 2007-08-15 15:01:20 -07:00
RelNotes-1.5.2.txt Documentation: typos / spelling fixes in older RelNotes 2008-08-05 11:38:11 -07:00
RelNotes-1.5.3.1.txt GIT 1.5.3.1: obsolete git-p4 in RPM spec file. 2007-09-03 01:28:37 -07:00
RelNotes-1.5.3.2.txt GIT 1.5.3.2 2007-09-19 03:11:28 -07:00
RelNotes-1.5.3.3.txt fix doc typos 2008-01-29 22:00:34 -08:00
RelNotes-1.5.3.4.txt GIT 1.5.3.4 2007-10-03 02:33:48 -07:00
RelNotes-1.5.3.5.txt RelNotes-1.5.3.5: fix another typo 2007-11-07 11:37:15 -08:00
RelNotes-1.5.3.6.txt GIT 1.5.3.6 2007-11-18 14:00:38 -08:00
RelNotes-1.5.3.7.txt GIT 1.5.3.7 2007-12-01 11:20:00 -08:00
RelNotes-1.5.3.8.txt GIT 1.5.3.8 2008-01-07 22:41:43 -08:00
RelNotes-1.5.3.txt Documentation: typos / spelling fixes in older RelNotes 2008-08-05 11:38:11 -07:00
RelNotes-1.5.4.1.txt GIT 1.5.4.2 2008-02-17 00:20:38 -08:00
RelNotes-1.5.4.2.txt GIT 1.5.4.2 2008-02-17 00:20:38 -08:00
RelNotes-1.5.4.3.txt GIT 1.5.4.3 2008-02-23 11:31:04 -08:00
RelNotes-1.5.4.4.txt Documentation: typos / spelling fixes in older RelNotes 2008-08-05 11:38:11 -07:00
RelNotes-1.5.4.5.txt Documentation: typos / spelling fixes in older RelNotes 2008-08-05 11:38:11 -07:00
RelNotes-1.5.4.6.txt GIT 1.5.4.6 2008-06-26 17:11:21 -07:00
RelNotes-1.5.4.7.txt GIT 1.5.4.7 2008-12-16 22:06:47 -08:00
RelNotes-1.5.4.txt GIT 1.5.4 2008-02-01 19:10:10 -08:00
RelNotes-1.5.5.1.txt GIT 1.5.5.1 2008-04-20 11:36:53 -07:00
RelNotes-1.5.5.2.txt Release Notes for 1.5.5.2 2008-05-25 21:11:24 -07:00
RelNotes-1.5.5.3.txt GIT 1.5.5.3 2008-05-27 22:32:47 -07:00
RelNotes-1.5.5.4.txt GIT 1.5.5.4 2008-06-07 11:45:48 -07:00
RelNotes-1.5.5.5.txt GIT 1.5.5.5 2008-06-26 17:59:51 -07:00
RelNotes-1.5.5.6.txt GIT 1.5.5.6 2008-12-16 22:08:28 -08:00
RelNotes-1.5.5.txt GIT 1.5.5 2008-04-07 21:57:43 -07:00
RelNotes-1.5.6.1.txt GIT 1.5.6.1 2008-06-25 17:13:48 -07:00
RelNotes-1.5.6.2.txt GIT 1.5.6.2 2008-07-04 01:38:41 -07:00
RelNotes-1.5.6.3.txt GIT 1.5.6.3 2008-07-13 15:23:43 -07:00
RelNotes-1.5.6.4.txt GIT 1.5.6.4 2008-07-19 10:58:01 -07:00
RelNotes-1.5.6.5.txt GIT 1.5.6.5 2008-08-06 13:40:53 -07:00
RelNotes-1.5.6.6.txt GIT 1.5.6.6 2008-12-16 22:13:36 -08:00
RelNotes-1.5.6.txt GIT 1.5.6 2008-06-18 13:09:43 -07:00
RelNotes-1.6.0.1.txt GIT 1.6.0.1 2008-08-24 14:47:24 -07:00
RelNotes-1.6.0.2.txt Documentation: Typos / spelling fixes in RelNotes 2009-03-03 21:40:36 -08:00
RelNotes-1.6.0.3.txt GIT 1.6.0.3 2008-10-21 13:37:42 -07:00
RelNotes-1.6.0.4.txt Fix typos in the documentation. 2008-11-27 01:00:45 -08:00
RelNotes-1.6.0.5.txt GIT 1.6.0.5 2008-12-07 15:11:54 -08:00
RelNotes-1.6.0.6.txt GIT 1.6.0.6 2008-12-19 19:27:35 -08:00
RelNotes-1.6.0.txt GIT 1.6.0 2008-08-17 11:42:10 -07:00
RelNotes-1.6.1.1.txt Documentation: Typos / spelling fixes in RelNotes 2009-03-03 21:40:36 -08:00
RelNotes-1.6.1.2.txt Documentation: Typos / spelling fixes in RelNotes 2009-03-03 21:40:36 -08:00
RelNotes-1.6.1.3.txt GIT 1.6.1.3 2009-02-07 00:51:47 -08:00
RelNotes-1.6.1.4.txt GIT 1.6.1.4 2009-05-03 15:29:31 -07:00
RelNotes-1.6.1.txt GIT 1.6.1 2008-12-24 19:41:08 -08:00
RelNotes-1.6.2.1.txt GIT 1.6.2.1 2009-03-15 13:05:05 -07:00
RelNotes-1.6.2.2.txt GIT 1.6.2.2 2009-04-02 12:34:16 -07:00
RelNotes-1.6.2.3.txt GIT 1.6.2.3 2009-04-12 15:57:58 -07:00
RelNotes-1.6.2.4.txt GIT 1.6.2.4 2009-04-19 17:34:26 -07:00
RelNotes-1.6.2.5.txt GIT 1.6.2.5 2009-05-03 16:54:14 -07:00
RelNotes-1.6.2.txt GIT 1.6.2 2009-03-03 23:37:19 -08:00
RelNotes-1.6.3.1.txt GIT 1.6.3.1 2009-05-12 22:30:29 -07:00
RelNotes-1.6.3.2.txt GIT 1.6.3.2 2009-06-03 22:47:48 -07:00
RelNotes-1.6.3.3.txt GIT 1.6.3.3 2009-06-21 21:15:50 -07:00
RelNotes-1.6.3.4.txt GIT 1.6.3.4 2009-07-28 23:59:30 -07:00
RelNotes-1.6.3.txt GIT 1.6.3 2009-05-06 18:16:40 -07:00
RelNotes-1.6.4.1.txt GIT 1.6.4.1 2009-08-21 20:16:10 -07:00
RelNotes-1.6.4.2.txt GIT 1.6.4.2 2009-08-29 14:31:01 -07:00
RelNotes-1.6.4.3.txt GIT 1.6.4.3 2009-09-13 01:28:13 -07:00
RelNotes-1.6.4.4.txt GIT 1.6.4.4 2009-09-16 14:53:26 -07:00
RelNotes-1.6.4.txt GIT 1.6.4 2009-07-29 00:32:42 -07:00
RelNotes-1.6.5.1.txt GIT 1.6.5.1 2009-10-16 23:57:19 -07:00
RelNotes-1.6.5.2.txt GIT 1.6.5.2 2009-10-25 18:37:56 -07:00
RelNotes-1.6.5.3.txt Git 1.6.5.3 2009-11-16 00:05:12 -08:00
RelNotes-1.6.5.4.txt Prepare for 1.6.5.4 2009-12-02 10:29:00 -08:00
RelNotes-1.6.5.5.txt Git 1.6.5.5 2009-12-05 11:08:35 -08:00
RelNotes-1.6.5.6.txt Git 1.6.5.6 2009-12-10 15:42:30 -08:00
RelNotes-1.6.5.7.txt Git 1.6.5.7 2009-12-16 12:45:25 -08:00
RelNotes-1.6.5.8.txt Git 1.6.5.8 2010-01-20 12:44:59 -08:00
RelNotes-1.6.5.txt GIT 1.6.5 2009-10-10 00:05:19 -07:00
RelNotes-1.6.6.1.txt Git 1.6.6.1 2010-01-20 13:29:21 -08:00
RelNotes-1.6.6.2.txt Fix typo in 1.6.6.2 release notes 2010-02-12 15:40:01 -08:00
RelNotes-1.6.6.txt Git 1.6.6 2009-12-23 12:23:11 -08:00
RelNotes-1.7.0.1.txt Git 1.7.0.1 2010-02-28 11:41:24 -08:00
RelNotes-1.7.0.2.txt Git 1.7.0.2 2010-03-07 11:07:51 -08:00
RelNotes-1.7.0.3.txt Git 1.7.0.3 2010-03-21 17:01:22 -07:00
RelNotes-1.7.0.4.txt Git 1.7.0.4 2010-03-31 15:12:08 -07:00
RelNotes-1.7.0.5.txt Git 1.7.0.5 2010-04-11 13:42:33 -07:00
RelNotes-1.7.0.6.txt Git 1.7.0.6 2010-04-22 23:04:21 -07:00
RelNotes-1.7.0.7.txt Git 1.7.0.7 2010-07-27 14:09:11 -07:00
RelNotes-1.7.0.txt Git 1.7.0 2010-02-12 15:45:05 -08:00
RelNotes-1.7.1.1.txt Git 1.7.1.1 2010-06-29 09:59:56 -07:00
RelNotes-1.7.1.2.txt Git 1.7.1.2 2010-07-27 16:36:51 -07:00
RelNotes-1.7.1.txt Git 1.7.1 2010-04-23 18:27:17 -07:00
RelNotes-1.7.2.1.txt Git 1.7.2.1 2010-07-27 16:42:53 -07:00
RelNotes-1.7.2.txt Git 1.7.2 2010-07-21 12:55:50 -07:00
rev-list-options.txt Merge branch 'tr/rev-list-count' 2010-06-30 11:55:38 -07:00
revisions.txt Documentation: split off rev doc into include file 2010-07-05 13:38:10 -07:00
SubmittingPatches Merge branch 'rr/doc-submitting' into maint 2010-06-16 16:23:14 -07:00
urls-remotes.txt Documentation: spell 'git cmd' without dash throughout 2010-01-10 13:01:28 +01:00
urls.txt Documentation/urls: Rewrite to accomodate <transport>::<address> 2010-04-18 13:56:05 -07:00
user-manual.conf Documentation: rename gitlink macro to linkgit 2008-01-06 18:41:44 -08:00
user-manual.txt Documentation: link to gitrevisions rather than git-rev-parse 2010-07-05 13:39:13 -07:00