summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | Merge branch 'tc/checkout-B'Junio C Hamano2010-08-181-2/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/checkout: learn -BTay Ray Chuan2010-06-251-2/+19
* | | | | | | | | | Merge branch 'jn/doc-pull'Junio C Hamano2010-08-121-11/+54
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Documentation: flesh out “git pull” descriptionJonathan Nieder2010-08-021-11/+54
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tr/rfc-reset-doc'Junio C Hamano2010-08-121-169/+178
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Documentation/reset: move "undo permanently" example behind "make topic"Thomas Rast2010-07-191-13/+13
| * | | | | | | | Documentation/reset: reorder examples to match descriptionThomas Rast2010-07-191-23/+23
| * | | | | | | | Documentation/reset: promote 'examples' one section upThomas Rast2010-07-191-107/+109
| * | | | | | | | Documentation/reset: separate options by modeThomas Rast2010-07-191-26/+33
| * | | | | | | | Documentation/git-reset: reorder modes for soft-mixed-hard progressionThomas Rast2010-07-191-6/+6
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-08-097-7/+55
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Documentation: add a FILES section for show-refJonathan Nieder2010-08-091-1/+7
| * | | | | | | | Documentation/git-log: Clarify --full-diffMichael J Gruber2010-08-091-0/+3
| * | | | | | | | prune: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-091-0/+2
| * | | | | | | | notes: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-091-0/+2
| * | | | | | | | Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -CMatthieu Moy2010-08-091-5/+30
| * | | | | | | | Documentation: cite git-am from git-applyBrad King2010-08-091-0/+10
| * | | | | | | | pretty-options.txt: match --format's documentation with implementation.Matthieu Moy2010-08-051-1/+1