summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-07-06 15:38:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-07-06 15:38:18 -0700
commit71ee7fd15457a0252c089420b5b66de266dcbd2f (patch)
tree98d4d7d1f72c30fd7695f011be78d3e45158c41a
parentMerge commit 'v1.6.0' into jc/checkout-reflog-fix (diff)
parentGit 1.7.0 (diff)
downloadtgif-71ee7fd15457a0252c089420b5b66de266dcbd2f.tar.xz
Merge commit 'v1.7.0' into jc/checkout-reflog-fix
* commit 'v1.7.0': (4188 commits) Git 1.7.0 Fix typo in 1.6.6.2 release notes Re-fix check-ref-format documentation mark-up archive documentation: attributes are taken from the tree by default Documentation: minor fixes to RelNotes-1.7.0 bash: support 'git am's new '--continue' option filter-branch: Fix error message for --prune-empty --commit-filter am: switch --resolved to --continue Update draft release notes to 1.7.0 one more time Git 1.6.6.2 t8003: check exit code of command and error message separately check-ref-format documentation: fix enumeration mark-up Documentation: quote braces in {upstream} notation t3902: Protect against OS X normalization blame: prevent a segv when -L given start > EOF git-push: document all the status flags used in the output Fix parsing of imap.preformattedHTML and imap.sslverify git-add documentation: Fix shell quoting example Revert "pack-objects: fix pack generation when using pack_size_limit" archive: simplify archive format guessing ...
-rw-r--r--.gitattributes3
-rw-r--r--.gitignore361
-rw-r--r--.mailmap1
-rw-r--r--COPYING25
-rw-r--r--Documentation/.gitignore1
-rw-r--r--Documentation/CodingGuidelines12
-rw-r--r--Documentation/Makefile199
-rw-r--r--Documentation/RelNotes-1.5.2.2.txt2
-rw-r--r--Documentation/RelNotes-1.5.4.7.txt10
-rw-r--r--Documentation/RelNotes-1.5.5.6.txt10
-rw-r--r--Documentation/RelNotes-1.5.6.6.txt10
-rw-r--r--Documentation/RelNotes-1.6.0.1.txt36
-rw-r--r--Documentation/RelNotes-1.6.0.2.txt87
-rw-r--r--Documentation/RelNotes-1.6.0.3.txt117
-rw-r--r--Documentation/RelNotes-1.6.0.4.txt39
-rw-r--r--Documentation/RelNotes-1.6.0.5.txt56
-rw-r--r--Documentation/RelNotes-1.6.0.6.txt33
-rw-r--r--Documentation/RelNotes-1.6.1.1.txt59
-rw-r--r--Documentation/RelNotes-1.6.1.2.txt39
-rw-r--r--Documentation/RelNotes-1.6.1.3.txt32
-rw-r--r--Documentation/RelNotes-1.6.1.4.txt44
-rw-r--r--Documentation/RelNotes-1.6.1.txt286
-rw-r--r--Documentation/RelNotes-1.6.2.1.txt19
-rw-r--r--Documentation/RelNotes-1.6.2.2.txt45
-rw-r--r--Documentation/RelNotes-1.6.2.3.txt22
-rw-r--r--Documentation/RelNotes-1.6.2.4.txt39
-rw-r--r--Documentation/RelNotes-1.6.2.5.txt21
-rw-r--r--Documentation/RelNotes-1.6.2.txt164
-rw-r--r--Documentation/RelNotes-1.6.3.1.txt10
-rw-r--r--Documentation/RelNotes-1.6.3.2.txt61
-rw-r--r--Documentation/RelNotes-1.6.3.3.txt38
-rw-r--r--Documentation/RelNotes-1.6.3.4.txt36
-rw-r--r--Documentation/RelNotes-1.6.3.txt182
-rw-r--r--Documentation/RelNotes-1.6.4.1.txt46
-rw-r--r--Documentation/RelNotes-1.6.4.2.txt32
-rw-r--r--Documentation/RelNotes-1.6.4.3.txt29
-rw-r--r--Documentation/RelNotes-1.6.4.4.txt26
-rw-r--r--Documentation/RelNotes-1.6.4.txt147
-rw-r--r--Documentation/RelNotes-1.6.5.1.txt20
-rw-r--r--Documentation/RelNotes-1.6.5.2.txt19
-rw-r--r--Documentation/RelNotes-1.6.5.3.txt63
-rw-r--r--Documentation/RelNotes-1.6.5.4.txt32
-rw-r--r--Documentation/RelNotes-1.6.5.5.txt49
-rw-r--r--Documentation/RelNotes-1.6.5.6.txt23
-rw-r--r--Documentation/RelNotes-1.6.5.7.txt19
-rw-r--r--Documentation/RelNotes-1.6.5.8.txt28
-rw-r--r--Documentation/RelNotes-1.6.5.txt169
-rw-r--r--Documentation/RelNotes-1.6.6.1.txt37
-rw-r--r--Documentation/RelNotes-1.6.6.2.txt46
-rw-r--r--Documentation/RelNotes-1.6.6.txt224
-rw-r--r--Documentation/RelNotes-1.7.0.txt214
-rw-r--r--Documentation/SubmittingPatches97
-rw-r--r--Documentation/asciidoc.conf29
-rw-r--r--Documentation/blame-options.txt32
-rw-r--r--Documentation/callouts.xsl30
-rwxr-xr-xDocumentation/cat-texi.perl8
-rw-r--r--Documentation/config.txt845
-rw-r--r--Documentation/date-formats.txt26
-rw-r--r--Documentation/diff-format.txt24
-rw-r--r--Documentation/diff-generate-patch.txt6
-rw-r--r--Documentation/diff-options.txt148
-rw-r--r--Documentation/docbook-xsl.css14
-rw-r--r--Documentation/everyday.txt2
-rw-r--r--Documentation/fetch-options.txt70
-rw-r--r--Documentation/git-add.txt108
-rw-r--r--Documentation/git-am.txt98
-rw-r--r--Documentation/git-annotate.txt9
-rw-r--r--Documentation/git-apply.txt106
-rw-r--r--Documentation/git-archimport.txt12
-rw-r--r--Documentation/git-archive.txt65
-rw-r--r--Documentation/git-bisect-lk2009.txt1358
-rw-r--r--Documentation/git-bisect.txt227
-rw-r--r--Documentation/git-blame.txt72
-rw-r--r--Documentation/git-branch.txt119
-rw-r--r--Documentation/git-bundle.txt186
-rw-r--r--Documentation/git-cat-file.txt22
-rw-r--r--Documentation/git-check-attr.txt65
-rw-r--r--Documentation/git-check-ref-format.txt82
-rw-r--r--Documentation/git-checkout-index.txt8
-rw-r--r--Documentation/git-checkout.txt150
-rw-r--r--Documentation/git-cherry-pick.txt15
-rw-r--r--Documentation/git-cherry.txt9
-rw-r--r--Documentation/git-citool.txt4
-rw-r--r--Documentation/git-clean.txt23
-rw-r--r--Documentation/git-clone.txt73
-rw-r--r--Documentation/git-commit-tree.txt7
-rw-r--r--Documentation/git-commit.txt92
-rw-r--r--Documentation/git-config.txt45
-rw-r--r--Documentation/git-count-objects.txt5
-rw-r--r--Documentation/git-cvsexportcommit.txt6
-rw-r--r--Documentation/git-cvsimport.txt54
-rw-r--r--Documentation/git-cvsserver.txt44
-rw-r--r--Documentation/git-daemon.txt78
-rw-r--r--Documentation/git-describe.txt43
-rw-r--r--Documentation/git-diff-files.txt10
-rw-r--r--Documentation/git-diff-index.txt22
-rw-r--r--Documentation/git-diff-tree.txt34
-rw-r--r--Documentation/git-diff.txt8
-rw-r--r--Documentation/git-difftool.txt120
-rw-r--r--Documentation/git-fast-export.txt41
-rw-r--r--Documentation/git-fast-import.txt168
-rw-r--r--Documentation/git-fetch-pack.txt6
-rw-r--r--Documentation/git-fetch.txt45
-rw-r--r--Documentation/git-filter-branch.txt116
-rw-r--r--Documentation/git-fmt-merge-msg.txt6
-rw-r--r--Documentation/git-for-each-ref.txt12
-rw-r--r--Documentation/git-format-patch.txt128
-rw-r--r--Documentation/git-fsck.txt12
-rw-r--r--Documentation/git-gc.txt34
-rw-r--r--Documentation/git-get-tar-commit-id.txt6
-rw-r--r--Documentation/git-grep.txt36
-rw-r--r--Documentation/git-gui.txt39
-rw-r--r--Documentation/git-hash-object.txt22
-rw-r--r--Documentation/git-help.txt12
-rw-r--r--Documentation/git-http-backend.txt188
-rw-r--r--Documentation/git-http-fetch.txt2
-rw-r--r--Documentation/git-http-push.txt4
-rw-r--r--Documentation/git-imap-send.txt99
-rw-r--r--Documentation/git-index-pack.txt8
-rw-r--r--Documentation/git-init-db.txt2
-rw-r--r--Documentation/git-init.txt27
-rw-r--r--Documentation/git-instaweb.txt4
-rw-r--r--Documentation/git-log.txt36
-rw-r--r--Documentation/git-ls-files.txt19
-rw-r--r--Documentation/git-ls-tree.txt16
-rw-r--r--Documentation/git-mailinfo.txt32
-rw-r--r--Documentation/git-merge-base.txt79
-rw-r--r--Documentation/git-merge-file.txt30
-rw-r--r--Documentation/git-merge-index.txt14
-rw-r--r--Documentation/git-merge-one-file.txt6
-rw-r--r--Documentation/git-merge-tree.txt6
-rw-r--r--Documentation/git-merge.txt342
-rw-r--r--Documentation/git-mergetool--lib.txt54
-rw-r--r--Documentation/git-mergetool.txt38
-rw-r--r--Documentation/git-mktree.txt19