Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | | | Merge branch 'tc/checkout-B' | Junio C Hamano | 2010-08-18 | 1 | -2/+19 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | builtin/checkout: learn -B | Tay Ray Chuan | 2010-06-25 | 1 | -2/+19 |
* | | | | | | | | | | Merge branch 'jn/doc-pull' | Junio C Hamano | 2010-08-12 | 1 | -11/+54 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Documentation: flesh out “git pull” description | Jonathan Nieder | 2010-08-02 | 1 | -11/+54 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'tr/rfc-reset-doc' | Junio C Hamano | 2010-08-12 | 1 | -169/+178 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | Documentation/reset: move "undo permanently" example behind "make topic" | Thomas Rast | 2010-07-19 | 1 | -13/+13 |
| * | | | | | | | | Documentation/reset: reorder examples to match description | Thomas Rast | 2010-07-19 | 1 | -23/+23 |
| * | | | | | | | | Documentation/reset: promote 'examples' one section up | Thomas Rast | 2010-07-19 | 1 | -107/+109 |
| * | | | | | | | | Documentation/reset: separate options by mode | Thomas Rast | 2010-07-19 | 1 | -26/+33 |
| * | | | | | | | | Documentation/git-reset: reorder modes for soft-mixed-hard progression | Thomas Rast | 2010-07-19 | 1 | -6/+6 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-09 | 7 | -7/+55 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | Documentation: add a FILES section for show-ref | Jonathan Nieder | 2010-08-09 | 1 | -1/+7 |
| * | | | | | | | | Documentation/git-log: Clarify --full-diff | Michael J Gruber | 2010-08-09 | 1 | -0/+3 |
| * | | | | | | | | prune: allow --dry-run for -n and --verbose for -v | René Scharfe | 2010-08-09 | 1 | -0/+2 |
| * | | | | | | | | notes: allow --dry-run for -n and --verbose for -v | René Scharfe | 2010-08-09 | 1 | -0/+2 |
| * | | | | | | | | Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C | Matthieu Moy | 2010-08-09 | 1 | -5/+30 |
| * | | | | | | | | Documentation: cite git-am from git-apply | Brad King | 2010-08-09 | 1 | -0/+10 |
| * | | | | | | | | pretty-options.txt: match --format's documentation with implementation. | Matthieu Moy | 2010-08-05 | 1 | -1/+1 |