summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Typos in code comments, an error message, documentationRalf Wildenhues2010-08-222-2/+2
* Merge branch 'mm/rebase-i-exec'Junio C Hamano2010-08-217-11/+174
|\
| * git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey2010-08-131-2/+2
| * git-rebase--interactive.sh: rework skip_unnecessary_picksBrandon Casey2010-08-131-9/+14
| * test-lib: user-friendly alternatives to test [-d|-f|-e]Matthieu Moy2010-08-114-12/+51
| * rebase -i: add exec command to launch a shell commandMatthieu Moy2010-08-114-3/+122
* | Merge branch 'gb/split-cmdline-errmsg'Junio C Hamano2010-08-214-4/+18
|\ \
| * | split_cmdline: Allow caller to access error stringGreg Brockman2010-08-114-4/+18
| |/
* | Merge branch 'so/http-user-agent'Junio C Hamano2010-08-213-2/+18
|\ \
| * | Allow HTTP user agent string to be modified.Spencer E. Olson2010-08-113-2/+18
| |/
* | Merge branch 'mm/shortopt-detached'Junio C Hamano2010-08-217-80/+212
|\ \
| * | log: parse separate option for --globMatthieu Moy2010-08-062-2/+11
| * | log: parse separate options like git log --grep fooMatthieu Moy2010-08-062-28/+53
| * | diff: parse separate options --stat-width n, --stat-name-width nMatthieu Moy2010-08-061-5/+23
| * | diff: split off a function for --stat-* option parsingJonathan Nieder2010-08-061-27/+35
| * | diff: parse separate options like -S fooMatthieu Moy2010-08-065-23/+95
| |/
* | Merge branch 'sr/local-config'Junio C Hamano2010-08-211-2/+5
|\ \
| * | config: add --local optionSverre Rabbelier2010-08-041-2/+5
| |/
* | Merge branch 'nd/fix-sparse-checkout'Junio C Hamano2010-08-213-74/+108
|\ \
| * | unpack-trees: mark new entries skip-worktree appropriatelyNguyễn Thái Ngọc Duy2010-08-092-1/+3
| * | unpack-trees: do not check for conflict entries too earlyNguyễn Thái Ngọc Duy2010-08-091-4/+1
| * | unpack-trees: let read-tree -u remove index entries outside sparse areaNguyễn Thái Ngọc Duy2010-08-093-13/+30
| * | unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always setNguyễn Thái Ngọc Duy2010-08-092-14/+24
| * | t1011 (sparse checkout): style nitpicksJonathan Nieder2010-08-021-47/+55
* | | Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano2010-08-2110-55/+476
|\ \ \
| * | | Implement automatic fast-forward merge for submodulesHeiko Voigt2010-07-074-9/+291
| * | | setup_revisions(): Allow walking history in a submoduleHeiko Voigt2010-07-074-14/+58
| * | | Teach ref iteration module about submodulesHeiko Voigt2010-07-073-32/+127
* | | | Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano2010-08-212-0/+71
|\ \ \ \
| * | | | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren2010-08-122-2/+11
| * | | | t5520-pull: Add testcases showing spurious conflicts from git pull --rebaseElijah Newren2010-08-121-0/+62
| | |/ / | |/| |
* | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-2113-81/+340
|\ \ \ \
| * | | | t7609: test merge and checkout error messagesDiane Gasselin2010-08-111-0/+125
| * | | | unpack_trees: group error messages by typeMatthieu Moy2010-08-1111-17/+123
| * | | | merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy2010-08-113-32/+51
| * | | | merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-115-16/+31
| * | | | Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-116-52/+46
| | |_|/ | |/| |
* | | | Merge branch 'po/userdiff-csharp'Junio C Hamano2010-08-213-1/+19
|\ \ \ \
| * | | | Userdiff patterns for C#Petr Onderka2010-08-163-1/+19
| |/ / /
* | | | Merge branch 'ab/perl-install'Junio C Hamano2010-08-211-1/+1
|\ \ \ \
| * | | | perl/Makefile: Unset INSTALL_BASE when making perl.makÆvar Arnfjörð Bjarmason2010-08-121-1/+1
| |/ / /
* | | | Merge branch 'maint'Junio C Hamano2010-08-212-3/+3
|\ \ \ \
| * | | | t7403: add missing &&'sJens Lehmann2010-08-211-2/+2
| * | | | Tell ignore file about generate files in /gitweb/staticMark Rada2010-08-211-1/+1
* | | | | Merge branch 'maint'Junio C Hamano2010-08-201-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'jc/maint-follow-rename-fix' into maintJunio C Hamano2010-08-205-18/+41
| |\ \ \ \
| * \ \ \ \ Merge branch 'jn/maint-plug-leak' into maintJunio C Hamano2010-08-203-3/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jn/fix-abbrev' into maintJunio C Hamano2010-08-205-4/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'vs/doc-spell' into maintJunio C Hamano2010-08-209-16/+18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jn/rebase-rename-am' into maintJunio C Hamano2010-08-205-202/+345
| |\ \ \ \ \ \ \ \
View Lorry Controller Status