summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/detached-stash'Junio C Hamano2010-09-031-5/+11
|\
| * detached-stash: update DocumentationJon Seymour2010-08-211-5/+11
* | Merge branch 'jn/maint-doc-user-manual-html-doctype'Junio C Hamano2010-09-032-2/+5
|\ \
| * | docs: fix Makefile dependency for user manualJeff King2010-08-211-1/+1
| * | Documentation: set a !DOCTYPE for user manualJonathan Nieder2010-08-201-1/+4
* | | Merge branch 'jc/maint-doc-em-dash'Junio C Hamano2010-09-037-18/+19
|\ \ \
| * | | Work around em-dash handling in newer AsciiDocJunio C Hamano2010-08-247-18/+19
* | | | Merge branch 'mg/doc-bundle'Junio C Hamano2010-09-031-33/+34
|\ \ \ \
| * | | | git-bundle.txt: Clarify rev-list-args restrictionsMichael J Gruber2010-08-231-1/+2
| * | | | git-bundle.txt: whitespace cleanupMichael J Gruber2010-08-231-28/+28
| * | | | git-bundle.txt: CleanupMichael J Gruber2010-08-231-9/+9
* | | | | Merge branch 'jn/doc-backslash'Junio C Hamano2010-09-0326-59/+64
|\ \ \ \ \
| * | | | | Documentation: remove stray backslash in show-branch discussionJonathan Nieder2010-08-201-4/+4
| * | | | | Documentation: remove stray backslashes from "Fighting regressions" articleJonathan Nieder2010-08-201-1/+1
| * | | | | Documentation: do not convert ... operator to ellipsesJonathan Nieder2010-08-204-4/+4
| * | | | | Documentation: avoid stray backslash in user manualJonathan Nieder2010-08-201-2/+2
| * | | | | Documentation: avoid stray backslashes in core tutorialJonathan Nieder2010-08-201-9/+9
| * | | | | Documentation: remove stray backslashes in rev-parse manualJonathan Nieder2010-08-201-4/+5
| * | | | | Documentation: remove backslash before ~ in fast-import manualJonathan Nieder2010-08-201-1/+1
| * | | | | Documentation: remove stray backslash from "git bundle" manualJonathan Nieder2010-08-201-4/+4
| * | | | | Documentation/technical: avoid stray backslash in parse-options API docsJonathan Nieder2010-08-201-4/+4
| * | | | | Documentation: remove backslashes in manpage synopsesJonathan Nieder2010-08-207-10/+10
| * | | | | Documentation: clarify quoting in gitignore docsJonathan Nieder2010-08-201-2/+2
| * | | | | Documentation: clarify quoting in "git rm" exampleJonathan Nieder2010-08-201-3/+3
| * | | | | Documentation: add missing quotes to "git grep" examplesJonathan Nieder2010-08-201-2/+2
| * | | | | Documentation: clarify quoting in "git add" exampleJonathan Nieder2010-08-201-2/+2
| * | | | | Documentation: unbreak regex in show-ref manualJonathan Nieder2010-08-202-2/+3
| * | | | | Documentation: quoting trouble in "git rm" discussionJonathan Nieder2010-08-202-1/+3
| * | | | | Documentation: tweak description of log.dateJonathan Nieder2010-08-201-4/+5
* | | | | | Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-032-9/+34
|\ \ \ \ \ \
| * | | | | | fmt-merge-msg -m to override merge titleJonathan Nieder2010-08-181-2/+7
| * | | | | | merge-base --independent to print reduced parent list in a mergeJonathan Nieder2010-08-181-0/+9
| * | | | | | merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder2010-08-181-7/+12
| * | | | | | Documentation: add a SEE ALSO section for merge-baseJonathan Nieder2010-08-181-0/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-034-0/+129
|\ \ \ \ \ \
| * | | | | | merge-recursive --renormalizeJonathan Nieder2010-08-061-0/+12
| * | | | | | ll-merge: make flag easier to populateJonathan Nieder2010-08-061-4/+7
| * | | | | | Documentation/technical: document ll_mergeJonathan Nieder2010-08-061-0/+70
| * | | | | | Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-022-0/+44
* | | | | | | Sync with 1.7.2.3Junio C Hamano2010-09-032-8/+2
|\ \ \ \ \ \ \
| * | | | | | | Git 1.7.2.3v1.7.2.3Junio C Hamano2010-09-032-8/+2
* | | | | | | | Prepare for 1.7.3Junio C Hamano2010-09-011-0/+73
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-09-011-0/+46
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Prepare for 1.7.2.3Junio C Hamano2010-09-011-0/+46
| * | | | | | | Merge branch 'dj/fetch-tagopt' into maintJunio C Hamano2010-09-012-3/+9
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | install-webdoc: filter timestamp-only changes correctlyJunio C Hamano2010-09-011-1/+1
* | | | | | | | Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-311-6/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Eliminate “Finished cherry-pick/revert” messageJonathan Nieder2010-08-151-6/+0
* | | | | | | | | Merge branch 'dj/fetch-tagopt'Junio C Hamano2010-08-312-3/+9
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | fetch: allow command line --tags to override configDaniel Johnson2010-08-142-3/+9
| | |_|_|/ / / / | |/| | | | | |