summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | 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
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'en/fast-export-fix'Junio C Hamano2010-08-311-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fast-export: Add a --full-tree optionElijah Newren2010-07-191-0/+6
* | | | | | | | | | | Merge branch 'hv/autosquash-config'Junio C Hamano2010-08-312-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | add configuration variable for --autosquash option of interactive rebaseHeiko Voigt2010-07-142-0/+11
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-08-228-9/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Typos in code comments, an error message, documentationRalf Wildenhues2010-08-228-9/+9
| * | | | | | | | | | Merge branch 'vs/doc-spell' into maintJunio C Hamano2010-08-209-16/+18
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/doc-pull' into maintJunio C Hamano2010-08-201-11/+54
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/rfc-reset-doc' into maintJunio C Hamano2010-08-201-169/+178
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Typos in code comments, an error message, documentationRalf Wildenhues2010-08-222-2/+2
* | | | | | | | | | | | | Merge branch 'mm/rebase-i-exec'Junio C Hamano2010-08-211-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rebase -i: add exec command to launch a shell commandMatthieu Moy2010-08-111-0/+24
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'so/http-user-agent'Junio C Hamano2010-08-211-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Allow HTTP user agent string to be modified.Spencer E. Olson2010-08-111-0/+9
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | unpack_trees: group error messages by typeMatthieu Moy2010-08-111-0/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'po/userdiff-csharp'Junio C Hamano2010-08-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Userdiff patterns for C#Petr Onderka2010-08-161-0/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'maint' to sync with 1.7.2.2Junio C Hamano2010-08-192-1/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Git 1.7.2.2v1.7.2.2Junio C Hamano2010-08-192-1/+24
* | | | | | | | | | | | Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-08-184-2/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Add the 'diff.ignoreSubmodules' config settingJohannes Schindelin2010-08-091-1/+6
| * | | | | | | | | | | Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann2010-08-094-2/+20
| * | | | | | | | | | | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-093-2/+20
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ml/rebase-x-strategy'Junio C Hamano2010-08-181-0/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase: support -X to pass through strategy optionsMike Lundy2010-08-031-0/+7
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'vs/doc-spell'Junio C Hamano2010-08-189-16/+18
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Documentation: spelling fixesVille Skyttä2010-07-209-16/+18
* | | | | | | | | | | Merge branch 'jh/clean-exclude'Junio C Hamano2010-08-181-1/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add -e/--exclude to git-clean.Jared Hance2010-07-201-1/+7
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jn/fast-import-subtree'Junio C Hamano2010-08-181-2/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Teach fast-import to import subtrees named by tree idJonathan Nieder2010-07-051-2/+6