summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Update draft release notes to 1.8.3Junio C Hamano2013-04-031-10/+31
* Sync with maintJunio C Hamano2013-04-033-0/+75
|\
| * Update draft release notes to 1.8.2.1Junio C Hamano2013-04-031-0/+35
| * Merge branch 'mg/gpg-interface-using-status' into maintJunio C Hamano2013-04-031-0/+1
| |\
| * \ Merge branch 'bc/commit-complete-lines-given-via-m-option' into maintJunio C Hamano2013-04-031-10/+19
| |\ \
| * \ \ Sync with 1.8.1 maintenance trackJunio C Hamano2013-04-032-0/+40
| |\ \ \
| | * | | Start preparing for 1.8.1.6Junio C Hamano2013-04-031-0/+34
| | * | | Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1Junio C Hamano2013-04-032-1/+26
| | |\ \ \
| | * | | | git-tag(1): we tag HEAD by defaultThomas Rast2013-04-031-0/+6
* | | | | | Merge branch 'jc/sha1-name-object-peeler'Junio C Hamano2013-04-031-0/+5
|\ \ \ \ \ \
| * | | | | | peel_onion(): teach $foo^{object} peelerJunio C Hamano2013-03-311-0/+5
| | |/ / / / | |/| | | |
* | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-021-0/+11
* | | | | | Merge branch 'bk/document-commit-tree-S'Junio C Hamano2013-04-021-1/+6
|\ \ \ \ \ \
| * | | | | | commit-tree: document -S option consistentlyBrad King2013-03-251-1/+6
* | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-011-2/+28
* | | | | | | Merge branch 'maint'Junio C Hamano2013-04-011-0/+4
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Update draft release notes to 1.8.2.1Junio C Hamano2013-04-011-0/+4
| * | | | | | Merge branch 'yd/doc-is-in-asciidoc' into maintJunio C Hamano2013-04-011-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'yd/doc-merge-annotated-tag' into maintJunio C Hamano2013-04-012-1/+26
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano2013-04-012-4/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'da/downcase-u-in-usage' into maintJunio C Hamano2013-04-011-2/+2
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \