summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cb/mergetool'Junio C Hamano2009-01-012-1/+20
|\
| * mergetool: Don't keep temporary merge files unless told toCharles Bailey2008-12-121-0/+7
| * Add -y/--no-prompt option to mergetoolCharles Bailey2008-11-142-1/+13
* | Merge branch 'maint'Junio C Hamano2009-01-011-2/+2
|\ \
| * | Documentation/git-tag.txt: minor typo and grammar fixjidanni@jidanni.org2009-01-011-2/+2
* | | Merge branch 'lt/reset-merge'Junio C Hamano2008-12-291-1/+28
|\ \ \
| * | | Document "git-reset --merge"Junio C Hamano2008-12-091-1/+28
* | | | Merge branch 'maint'Junio C Hamano2008-12-292-14/+27
|\ \ \ \ | | |/ / | |/| |
| * | | Prepare for v1.6.1.1 maintenance releaseJunio C Hamano2008-12-291-0/+23
| * | | Documentation/diff-options.txt: unify optionsjidanni@jidanni.org2008-12-291-14/+4
* | | | Fix the building of gitman.info documentTeemu Likonen2008-12-292-3/+7
* | | | Fix the building of user-manual.texi and gitman.texi documentsTeemu Likonen2008-12-291-3/+4
* | | | Merge branch 'maint'Junio C Hamano2008-12-272-13/+39
|\ \ \ \ | |/ / /
| * | | git-send-email.txt: move --format-patch paragraph to a proper locationAdeodato Simó2008-12-271-6/+6
| * | | git-shortlog.txt: improve documentation about .mailmap filesAdeodato Simó2008-12-271-7/+33
* | | | Start 1.6.2 cycleJunio C Hamano2008-12-271-0/+28
|/ / /
* | | GIT 1.6.1v1.6.1Junio C Hamano2008-12-242-0/+9
* | | GIT 1.6.1-rc4v1.6.1-rc4Junio C Hamano2008-12-211-1/+18
* | | Make help entries alphabeticalRichard Hartmann2008-12-211-4/+4
* | | Merge branch 'maint'Junio C Hamano2008-12-211-1/+2
|\ \ \
| * | | doc/git-fsck: change the way for getting heads' SHA1sMarkus Heidelberg2008-12-211-1/+2
* | | | git-revert documentation: refer to new HOWTO on reverting faulty mergesBoyd Stephen Smith Jr2008-12-211-0/+8
* | | | Documentation/git-show-branch: work around "single quote" typesetting glitchMarkus Heidelberg2008-12-211-1/+1
* | | | Add a documentat on how to revert a faulty mergeNanako Shiraishi2008-12-211-0/+179
* | | | Documentation: fix typos, grammar, asciidoc syntaxMarkus Heidelberg2008-12-191-1/+1
* | | | Merge branch 'maint' to sync with GIT 1.6.0.6Junio C Hamano2008-12-1920-29/+107
|\ \ \ \ | |/ / /
| * | | GIT 1.6.0.6v1.6.0.6Junio C Hamano2008-12-194-0/+63
| |\ \ \
| | * \ \ GIT 1.5.6.6v1.5.6.6Junio C Hamano2008-12-163-0/+30
| | |\ \ \
| | | * \ \ GIT 1.5.5.6v1.5.5.6Junio C Hamano2008-12-162-0/+20
| | | |\ \ \
| | | | * | | GIT 1.5.4.7v1.5.4.7Junio C Hamano2008-12-161-0/+10
| * | | | | | fast-export: deal with tag objects that do not have a taggerJohannes Schindelin2008-12-191-0/+6
| * | | | | | SubmittingPatches: mention the usage of real name in Signed-off-by: linesMiklos Vajna2008-12-191-0/+3
| * | | | | | Documentation: fix typos, grammar, asciidoc syntaxMarkus Heidelberg2008-12-1913-25/+25
* | | | | | | Documentation: sync example output with git outputMarkus Heidelberg2008-12-194-11/+9
* | | | | | | Clarify documentation of "git checkout <tree-ish> paths" syntaxNanako Shiraishi2008-12-171-1/+1
* | | | | | | githooks documentation: add a note about the +x modeMiklos Vajna2008-12-171-0/+4
* | | | | | | doc/git-reset: add reference to git-stashMarkus Heidelberg2008-12-171-0/+2
* | | | | | | Documentation: fix description for enabling hooksMarkus Heidelberg2008-12-172-2/+4
* | | | | | | git-daemon documentation: use {tilde}Miklos Vajna2008-12-171-2/+2
* | | | | | | Documentation: Describe git-gui Tools menu configuration options.Alexander Gavrilov2008-12-141-0/+51
* | | | | | | Merge branch 'maint'Junio C Hamano2008-12-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | git-config.txt: fix a typoJim Meyering2008-12-121-1/+1
* | | | | | | Merge branch 'maint'Junio C Hamano2008-12-091-9/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | work around Python warnings from AsciiDocJunio C Hamano2008-12-091-9/+9
* | | | | | | Fix typos in documentationAlexander Potashev2008-12-092-2/+2
* | | | | | | Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-099-49/+48
* | | | | | | Define linkgit macro in [macros] sectionAlexey Borzenkov2008-12-081-0/+3
* | | | | | | Point "stale" 1.6.0.5 documentation from the main git documentation pagev1.6.1-rc2Junio C Hamano2008-12-071-1/+2
* | | | | | | Update draft release notes for 1.6.1Junio C Hamano2008-12-071-22/+1
* | | | | | | Merge branch 'maint'Junio C Hamano2008-12-071-15/+28
|\ \ \ \ \ \ \ | |/ / / / / /