aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAge
* Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-03
|\
| * merge-recursive --renormalizeJonathan Nieder2010-08-06
| * ll-merge: make flag easier to populateJonathan Nieder2010-08-06
| * Documentation/technical: document ll_mergeJonathan Nieder2010-08-06
| * Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-02
* | Sync with 1.7.2.3Junio C Hamano2010-09-03
|\ \
| * | Git 1.7.2.3v1.7.2.3Junio C Hamano2010-09-03
* | | Prepare for 1.7.3Junio C Hamano2010-09-01
* | | Merge branch 'maint'Junio C Hamano2010-09-01
|\ \ \ | |/ /
| * | Prepare for 1.7.2.3Junio C Hamano2010-09-01
| * | Merge branch 'dj/fetch-tagopt' into maintJunio C Hamano2010-09-01
| |\ \
* | | | install-webdoc: filter timestamp-only changes correctlyJunio C Hamano2010-09-01
* | | | Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-31
|\ \ \ \
| * | | | Eliminate “Finished cherry-pick/revert” messageJonathan Nieder2010-08-15
* | | | | Merge branch 'dj/fetch-tagopt'Junio C Hamano2010-08-31
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | fetch: allow command line --tags to override configDaniel Johnson2010-08-14
* | | | | Merge branch 'en/fast-export-fix'Junio C Hamano2010-08-31
|\ \ \ \ \
| * | | | | fast-export: Add a --full-tree optionElijah Newren2010-07-19
* | | | | | Merge branch 'hv/autosquash-config'Junio C Hamano2010-08-31
|\ \ \ \ \ \
| * | | | | | add configuration variable for --autosquash option of interactive rebaseHeiko Voigt2010-07-14
* | | | | | | Merge branch 'maint'Junio C Hamano2010-08-22
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Typos in code comments, an error message, documentationRalf Wildenhues2010-08-22
| * | | | | | Merge branch 'vs/doc-spell' into maintJunio C Hamano2010-08-20
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jn/doc-pull' into maintJunio C Hamano2010-08-20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tr/rfc-reset-doc' into maintJunio C Hamano2010-08-20
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Typos in code comments, an error message, documentationRalf Wildenhues2010-08-22
* | | | | | | | | | Merge branch 'mm/rebase-i-exec'Junio C Hamano2010-08-21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase -i: add exec command to launch a shell commandMatthieu Moy2010-08-11
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'so/http-user-agent'Junio C Hamano2010-08-21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow HTTP user agent string to be modified.Spencer E. Olson2010-08-11
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | unpack_trees: group error messages by typeMatthieu Moy2010-08-11
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'po/userdiff-csharp'Junio C Hamano2010-08-21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Userdiff patterns for C#Petr Onderka2010-08-16
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'maint' to sync with 1.7.2.2Junio C Hamano2010-08-19
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Git 1.7.2.2v1.7.2.2Junio C Hamano2010-08-19
* | | | | | | | | | Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-08-18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add the 'diff.ignoreSubmodules' config settingJohannes Schindelin2010-08-09
| * | | | | | | | | | Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann2010-08-09
| * | | | | | | | | | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-09
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ml/rebase-x-strategy'Junio C Hamano2010-08-18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase: support -X to pass through strategy optionsMike Lundy2010-08-03
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'vs/doc-spell'Junio C Hamano2010-08-18
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Documentation: spelling fixesVille Skyttä2010-07-20
* | | | | | | | | | Merge branch 'jh/clean-exclude'Junio C Hamano2010-08-18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add -e/--exclude to git-clean.Jared Hance2010-07-20
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jn/fast-import-subtree'Junio C Hamano2010-08-18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Teach fast-import to import subtrees named by tree idJonathan Nieder2010-07-05
* | | | | | | | | | | Merge branch 'tc/checkout-B'Junio C Hamano2010-08-18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/checkout: learn -BTay Ray Chuan2010-06-25