Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | merge-base --octopus to mimic show-branch --merge-base | Jonathan Nieder | 2010-08-18 | 1 | -7/+12 | |
| * | | | | | | | | | Documentation: add a SEE ALSO section for merge-base | Jonathan Nieder | 2010-08-18 | 1 | -0/+6 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 4 | -0/+129 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 | 1 | -0/+12 | |
| * | | | | | | | | | ll-merge: make flag easier to populate | Jonathan Nieder | 2010-08-06 | 1 | -4/+7 | |
| * | | | | | | | | | Documentation/technical: document ll_merge | Jonathan Nieder | 2010-08-06 | 1 | -0/+70 | |
| * | | | | | | | | | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 | 2 | -0/+44 | |
* | | | | | | | | | | Sync with 1.7.2.3 | Junio C Hamano | 2010-09-03 | 2 | -8/+2 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Git 1.7.2.3v1.7.2.3 | Junio C Hamano | 2010-09-03 | 2 | -8/+2 | |
* | | | | | | | | | | Prepare for 1.7.3 | Junio C Hamano | 2010-09-01 | 1 | -0/+73 | |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-09-01 | 1 | -0/+46 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Prepare for 1.7.2.3 | Junio C Hamano | 2010-09-01 | 1 | -0/+46 | |
| * | | | | | | | | | Merge branch 'dj/fetch-tagopt' into maint | Junio C Hamano | 2010-09-01 | 2 | -3/+9 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | install-webdoc: filter timestamp-only changes correctly | Junio C Hamano | 2010-09-01 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'jn/cherry-revert-message-clean-up' | Junio C Hamano | 2010-08-31 | 1 | -6/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Eliminate “Finished cherry-pick/revert” message | Jonathan Nieder | 2010-08-15 | 1 | -6/+0 | |
* | | | | | | | | | | | Merge branch 'dj/fetch-tagopt' | Junio C Hamano | 2010-08-31 | 2 | -3/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | fetch: allow command line --tags to override config | Daniel Johnson | 2010-08-14 | 2 | -3/+9 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'en/fast-export-fix' | Junio C Hamano | 2010-08-31 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | fast-export: Add a --full-tree option | Elijah Newren | 2010-07-19 | 1 | -0/+6 | |
* | | | | | | | | | | | Merge branch 'hv/autosquash-config' | Junio C Hamano | 2010-08-31 | 2 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | add configuration variable for --autosquash option of interactive rebase | Heiko Voigt | 2010-07-14 | 2 | -0/+11 | |
* | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-22 | 8 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Typos in code comments, an error message, documentation | Ralf Wildenhues | 2010-08-22 | 8 | -9/+9 | |
| * | | | | | | | | | | Merge branch 'vs/doc-spell' into maint | Junio C Hamano | 2010-08-20 | 9 | -16/+18 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/doc-pull' into maint | Junio C Hamano | 2010-08-20 | 1 | -11/+54 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/rfc-reset-doc' into maint | Junio C Hamano | 2010-08-20 | 1 | -169/+178 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Typos in code comments, an error message, documentation | Ralf Wildenhues | 2010-08-22 | 2 | -2/+2 | |
* | | | | | | | | | | | | | Merge branch 'mm/rebase-i-exec' | Junio C Hamano | 2010-08-21 | 1 | -0/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | rebase -i: add exec command to launch a shell command | Matthieu Moy | 2010-08-11 | 1 | -0/+24 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'so/http-user-agent' | Junio C Hamano | 2010-08-21 | 1 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Allow HTTP user agent string to be modified. | Spencer E. Olson | 2010-08-11 | 1 | -0/+9 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-08-21 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | unpack_trees: group error messages by type | Matthieu Moy | 2010-08-11 | 1 | -0/+2 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'po/userdiff-csharp' | Junio C Hamano | 2010-08-21 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Userdiff patterns for C# | Petr Onderka | 2010-08-16 | 1 | -0/+2 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'maint' to sync with 1.7.2.2 | Junio C Hamano | 2010-08-19 | 2 | -1/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Git 1.7.2.2v1.7.2.2 | Junio C Hamano | 2010-08-19 | 2 | -1/+24 | |
* | | | | | | | | | | | | Merge branch 'jl/submodule-ignore-diff' | Junio C Hamano | 2010-08-18 | 4 | -2/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add the 'diff.ignoreSubmodules' config setting | Johannes Schindelin | 2010-08-09 | 1 | -1/+6 | |
| * | | | | | | | | | | | Submodules: Use "ignore" settings from .gitmodules too for diff and status | Jens Lehmann | 2010-08-09 | 4 | -2/+20 | |
| * | | | | | | | | | | | Submodules: Add the new "ignore" config option for diff and status | Jens Lehmann | 2010-08-09 | 3 | -2/+20 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'ml/rebase-x-strategy' | Junio C Hamano | 2010-08-18 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | rebase: support -X to pass through strategy options | Mike Lundy | 2010-08-03 | 1 | -0/+7 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'vs/doc-spell' | Junio C Hamano | 2010-08-18 | 9 | -16/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Documentation: spelling fixes | Ville Skyttä | 2010-07-20 | 9 | -16/+18 | |
* | | | | | | | | | | | Merge branch 'jh/clean-exclude' | Junio C Hamano | 2010-08-18 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add -e/--exclude to git-clean. | Jared Hance | 2010-07-20 | 1 | -1/+7 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'jn/fast-import-subtree' | Junio C Hamano | 2010-08-18 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Teach fast-import to import subtrees named by tree id | Jonathan Nieder | 2010-07-05 | 1 | -2/+6 |