Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'gb/split-cmdline-errmsg' | Junio C Hamano | 2010-08-21 | 4 | -4/+18 |
|\ | |||||
| * | split_cmdline: Allow caller to access error string | Greg Brockman | 2010-08-11 | 4 | -4/+18 |
* | | Merge branch 'so/http-user-agent' | Junio C Hamano | 2010-08-21 | 3 | -2/+18 |
|\ \ | |||||
| * | | Allow HTTP user agent string to be modified. | Spencer E. Olson | 2010-08-11 | 3 | -2/+18 |
| |/ | |||||
* | | Merge branch 'mm/shortopt-detached' | Junio C Hamano | 2010-08-21 | 7 | -80/+212 |
|\ \ | |||||
| * | | log: parse separate option for --glob | Matthieu Moy | 2010-08-06 | 2 | -2/+11 |
| * | | log: parse separate options like git log --grep foo | Matthieu Moy | 2010-08-06 | 2 | -28/+53 |
| * | | diff: parse separate options --stat-width n, --stat-name-width n | Matthieu Moy | 2010-08-06 | 1 | -5/+23 |
| * | | diff: split off a function for --stat-* option parsing | Jonathan Nieder | 2010-08-06 | 1 | -27/+35 |
| * | | diff: parse separate options like -S foo | Matthieu Moy | 2010-08-06 | 5 | -23/+95 |
| |/ | |||||
* | | Merge branch 'sr/local-config' | Junio C Hamano | 2010-08-21 | 1 | -2/+5 |
|\ \ | |||||
| * | | config: add --local option | Sverre Rabbelier | 2010-08-04 | 1 | -2/+5 |
| |/ | |||||
* | | Merge branch 'nd/fix-sparse-checkout' | Junio C Hamano | 2010-08-21 | 3 | -74/+108 |
|\ \ | |||||
| * | | unpack-trees: mark new entries skip-worktree appropriately | Nguyễn Thái Ngọc Duy | 2010-08-09 | 2 | -1/+3 |
| * | | unpack-trees: do not check for conflict entries too early | Nguyễn Thái Ngọc Duy | 2010-08-09 | 1 | -4/+1 |
| * | | unpack-trees: let read-tree -u remove index entries outside sparse area | Nguyễn Thái Ngọc Duy | 2010-08-09 | 3 | -13/+30 |
| * | | unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set | Nguyễn Thái Ngọc Duy | 2010-08-09 | 2 | -14/+24 |
| * | | t1011 (sparse checkout): style nitpicks | Jonathan Nieder | 2010-08-02 | 1 | -47/+55 |
* | | | Merge branch 'hv/submodule-find-ff-merge' | Junio C Hamano | 2010-08-21 | 10 | -55/+476 |
|\ \ \ | |||||
| * | | | Implement automatic fast-forward merge for submodules | Heiko Voigt | 2010-07-07 | 4 | -9/+291 |
| * | | | setup_revisions(): Allow walking history in a submodule | Heiko Voigt | 2010-07-07 | 4 | -14/+58 |
| * | | | Teach ref iteration module about submodules | Heiko Voigt | 2010-07-07 | 3 | -32/+127 |
* | | | | Merge branch 'en/rebase-against-rebase-fix' | Junio C Hamano | 2010-08-21 | 2 | -0/+71 |
|\ \ \ \ | |||||
| * | | | | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches | Elijah Newren | 2010-08-12 | 2 | -2/+11 |
| * | | | | t5520-pull: Add testcases showing spurious conflicts from git pull --rebase | Elijah Newren | 2010-08-12 | 1 | -0/+62 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-08-21 | 13 | -81/+340 |
|\ \ \ \ | |||||
| * | | | | t7609: test merge and checkout error messages | Diane Gasselin | 2010-08-11 | 1 | -0/+125 |
| * | | | | unpack_trees: group error messages by type | Matthieu Moy | 2010-08-11 | 11 | -17/+123 |
| * | | | | merge-recursive: distinguish "removed" and "overwritten" messages | Matthieu Moy | 2010-08-11 | 3 | -32/+51 |
| * | | | | merge-recursive: porcelain messages for checkout | Diane Gasselin | 2010-08-11 | 5 | -16/+31 |
| * | | | | Turn unpack_trees_options.msgs into an array + enum | Matthieu Moy | 2010-08-11 | 6 | -52/+46 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'po/userdiff-csharp' | Junio C Hamano | 2010-08-21 | 3 | -1/+19 |
|\ \ \ \ | |||||
| * | | | | Userdiff patterns for C# | Petr Onderka | 2010-08-16 | 3 | -1/+19 |
| |/ / / | |||||
* | | | | Merge branch 'ab/perl-install' | Junio C Hamano | 2010-08-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | perl/Makefile: Unset INSTALL_BASE when making perl.mak | Ævar Arnfjörð Bjarmason | 2010-08-12 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-21 | 2 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | t7403: add missing &&'s | Jens Lehmann | 2010-08-21 | 1 | -2/+2 |
| * | | | | Tell ignore file about generate files in /gitweb/static | Mark Rada | 2010-08-21 | 1 | -1/+1 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-20 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'jc/maint-follow-rename-fix' into maint | Junio C Hamano | 2010-08-20 | 5 | -18/+41 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jn/maint-plug-leak' into maint | Junio C Hamano | 2010-08-20 | 3 | -3/+13 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jn/fix-abbrev' into maint | Junio C Hamano | 2010-08-20 | 5 | -4/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'vs/doc-spell' into maint | Junio C Hamano | 2010-08-20 | 9 | -16/+18 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jn/rebase-rename-am' into maint | Junio C Hamano | 2010-08-20 | 5 | -202/+345 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jn/doc-pull' into maint | Junio C Hamano | 2010-08-20 | 1 | -11/+54 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'bc/use-more-hardlinks-in-install' into maint | Junio C Hamano | 2010-08-20 | 1 | -3/+12 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/rfc-reset-doc' into maint | Junio C Hamano | 2010-08-20 | 1 | -169/+178 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | xmalloc: include size in the failure message | Matthieu Moy | 2010-08-20 | 1 | -1/+2 |
* | | | | | | | | | | | | | builtin/checkout: Fix message when switching to an existing branch | Ramkumar Ramachandra | 2010-08-20 | 1 | -1/+4 |
* | | | | | | | | | | | | | Merge branch 'maint' to sync with 1.7.2.2 | Junio C Hamano | 2010-08-19 | 3 | -2/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |