summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/apply-filename-with-sp'Junio C Hamano2010-09-0321-41/+456
|\
| * apply: handle traditional patches with space in filenameJonathan Nieder2010-08-212-16/+181
| * tests: exercise "git apply" with weird filenamesJonathan Nieder2010-08-2119-0/+213
| * apply: split quoted filename handling into new functionJonathan Nieder2010-08-212-33/+70
* | Merge branch 'jn/merge-custom-no-trivial'Junio C Hamano2010-09-032-26/+71
|\ \
| * | t7606: Avoid using head as a file nameBrian Gernhardt2010-08-241-4/+4
| * | merge: let custom strategies intervene in trivial mergesJonathan Nieder2010-08-152-3/+34
| * | t7606 (merge-theirs): modernize styleJonathan Nieder2010-08-151-26/+40
| |/
* | 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-039-562/+701
|\ \ \ \ \
| * | | | | merge script: learn --[no-]rerere-autoupdateJonathan Nieder2010-08-181-2/+5
| * | | | | merge script: notice @{-1} shorthandJonathan Nieder2010-08-181-2/+4
| * | | | | merge script: handle --no-ff --no-commit correctlyJonathan Nieder2010-08-181-2/+10
| * | | | | merge script: --ff-only to disallow true mergeJonathan Nieder2010-08-181-2/+15
| * | | | | merge script: handle many-way octopusJonathan Nieder2010-08-181-3/+3
| * | | | | merge script: handle -m --log correctlyJonathan Nieder2010-08-181-4/+10
| * | | | | merge script: forbid merge -s indexJonathan Nieder2010-08-181-0/+5
| * | | | | merge script: allow custom strategiesJonathan Nieder2010-08-181-2/+6
| * | | | | merge script: merge -X<option>Jonathan Nieder2010-08-181-1/+7
| * | | | | merge script: improve log message subjectJonathan Nieder2010-08-181-8/+19
| * | | | | merge script: refuse to merge during mergeJonathan Nieder2010-08-181-0/+3
| * | | | | merge script: tweak unmerged files message to match builtinJonathan Nieder2010-08-181-1/+1
| * | | | | merge script: --squash, --ff from unborn branch are errorsJonathan Nieder2010-08-181-0/+4
| * | | | | fmt-merge-msg -m to override merge titleJonathan Nieder2010-08-183-4/+55
| * | | | | merge-base --independent to print reduced parent list in a mergeJonathan Nieder2010-08-183-7/+62
| * | | | | merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder2010-08-183-10/+46
| * | | | | Documentation: add a SEE ALSO section for merge-baseJonathan Nieder2010-08-181-0/+6
View Lorry Controller Status