summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'yd/doc-is-in-asciidoc'Junio C Hamano2013-03-281-0/+3
|\
| * CodingGuidelines: our documents are in AsciiDocJunio C Hamano2013-03-211-0/+3
* | Merge branch 'yd/doc-merge-annotated-tag'Junio C Hamano2013-03-282-1/+26
|\ \
| * | Documentation: merging a tag is a special caseJunio C Hamano2013-03-212-1/+26
* | | Merge branch 'jk/difftool-dir-diff-edit-fix'Junio C Hamano2013-03-281-3/+5
|\ \ \
| * | | difftool --dir-diff: symlink all files matching the working treeJohn Keeping2013-03-141-1/+3
| * | | git-difftool(1): fix formatting of --symlink descriptionJohn Keeping2013-03-141-2/+2
* | | | Merge branch 'maint'Junio C Hamano2013-03-281-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-281-1/+1
| |\ \ \ \
| | * | | | git help config: s/insn/instruction/Matthias Krüger2013-03-281-1/+1
* | | | | | Merge branch 'maint'Junio C Hamano2013-03-273-1/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | More fixes for 1.8.2.1Junio C Hamano2013-03-271-0/+3
| * | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-272-1/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | git-commit doc: describe use of multiple `-m` optionsChristian Helmuth2013-03-271-0/+2
| | * | | | git-pull doc: fix grammo ("conflicts" is plural)Mihai Capotă2013-03-271-1/+1
* | | | | | More topics from the second batch for 1.8.3Junio C Hamano2013-03-261-14/+8
* | | | | | Merge branch 'kb/p4merge'Junio C Hamano2013-03-261-0/+6
|\ \ \ \ \ \
| * | | | | | mergetools/p4merge: create a base if none availableKevin Bracey2013-03-131-0/+6
* | | | | | | Merge branch 'maint'Junio C Hamano2013-03-262-3/+45
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | More corrections for 1.8.2.1Junio C Hamano2013-03-261-0/+39
| * | | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-261-3/+6
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Correct the docs about GIT_SSH.Dan Bornstein2013-03-261-3/+6
| * | | | | | Merge branch 'jc/maint-push-refspec-default-doc' into maintJunio C Hamano2013-03-261-9/+14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'wk/user-manual-literal-format' into maintJunio C Hamano2013-03-261-142/+144
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maintJunio C Hamano2013-03-262-5/+6
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Second wave of topics toward 1.8.3Junio C Hamano2013-03-251-7/+58
* | | | | | | | | | Merge branch 'jc/push-follow-tag'Junio C Hamano2013-03-251-1/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | push: --follow-tagsJunio C Hamano2013-03-051-1/+7
* | | | | | | | | | | Merge branch 'jl/submodule-deinit'Junio C Hamano2013-03-252-1/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodule: add 'deinit' commandJens Lehmann2013-03-042-1/+21
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-03-251-0/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Start preparing for 1.8.2.1Junio C Hamano2013-03-251-0/+29
| * | | | | | | | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-256-13/+47
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'tk/doc-filter-branch' into maint-1.8.1Junio C Hamano2013-03-251-2/+25
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'gp/describe-match-uses-glob-pattern' into maint-1.8.1Junio C Hamano2013-03-251-2/+3
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/doc-index-format' into maint-1.8.1Junio C Hamano2013-03-252-4/+12
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'wk/doc-pre-rebase' into maint-1.8.1Junio C Hamano2013-03-251-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/color-diff-doc' into maint-1.8.1Junio C Hamano2013-03-251-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-03-211-0/+76
* | | | | | | | | | | | | | | | Merge branch 'mn/send-email-works-with-credential'Junio C Hamano2013-03-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-send-email: use git credential to obtain passwordMichal Nazarewicz2013-02-271-2/+2
* | | | | | | | | | | | | | | | | Merge branch 'mg/gpg-interface-using-status'Junio C Hamano2013-03-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | pretty: make %GK output the signing key for signed commitsMichael J Gruber2013-02-141-0/+1
* | | | | | | | | | | | | | | | | | Merge branch 'bc/commit-complete-lines-given-via-m-option'Junio C Hamano2013-03-211-10/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Documentation/git-commit.txt: rework the --cleanup sectionBrandon Casey2013-02-191-10/+19
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/count-garbage'Junio C Hamano2013-03-211-5/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | count-objects: report how much disk space taken by garbage filesNguyễn Thái Ngọc Duy2013-02-151-0/+2
| * | | | | | | | | | | | | | | | | | | count-objects: report garbage files in pack directory tooNguyễn Thái Ngọc Duy2013-02-151-2/+2
| * | | | | | | | | | | | | | | | | | | git-count-objects.txt: describe each line in -v outputNguyễn Thái Ngọc Duy2013-02-081-5/+15
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fetch-raw-sha1'Junio C Hamano2013-03-211-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \