aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-08-18
|\
| * Add tests for the diff.ignoreSubmodules config optionJens Lehmann2010-08-09
| * 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 'jn/fix-abbrev'Junio C Hamano2010-08-18
|\ \
| * | examples/commit: use --abbrev for commit summaryJonathan Nieder2010-07-27
| * | checkout, commit: remove confusing assignments to rev.abbrevJonathan Nieder2010-07-27
| * | archive: abbreviate substituted commit ids againJonathan Nieder2010-07-27
* | | Merge branch 'vs/doc-spell'Junio C Hamano2010-08-18
|\ \ \
| * | | Documentation: spelling fixesVille Skyttä2010-07-20
* | | | Merge branch 'jh/use-test-must-fail'Junio C Hamano2010-08-18
|\ \ \ \
| * | | | Convert "! git" to "test_must_fail git"Jared Hance2010-07-20
* | | | | Merge branch 'jh/clean-exclude'Junio C Hamano2010-08-18
|\ \ \ \ \
| * | | | | Add test for git clean -e.Jared Hance2010-07-20
| * | | | | Add -e/--exclude to git-clean.Jared Hance2010-07-20
| |/ / / /
* | | | | Merge branch 'kf/post-receive-sample-hook'Junio C Hamano2010-08-18
|\ \ \ \ \
| * | | | | post-receive-email: optional message line count limitKevin P. Fleming2010-07-16
* | | | | | Merge branch 'ab/report-corrupt-object-with-type'Junio C Hamano2010-08-18
|\ \ \ \ \ \
| * | | | | | sha1_file: Show the the type and path to corrupt objectsÆvar Arnfjörð Bjarmason2010-07-14
* | | | | | | Merge branch 'jn/rebase-rename-am'Junio C Hamano2010-08-18
|\ \ \ \ \ \ \
| * | | | | | | rebase: protect against diff.renames configurationJunio C Hamano2010-07-23
| * | | | | | | t3400 (rebase): whitespace cleanupJonathan Nieder2010-07-23
| * | | | | | | Teach "apply --index-info" to handle rename patchesJunio C Hamano2010-07-23
| * | | | | | | t4150 (am): futureproof against failing testsJonathan Nieder2010-07-23
| * | | | | | | t4150 (am): style fixJonathan Nieder2010-07-23
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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 'ar/string-list-foreach'Junio C Hamano2010-08-18
|\ \ \ \ \ \ \ \
| * | | | | | | | Convert the users of for_each_string_list to for_each_string_list_item macroAlex Riesen2010-07-05
| * | | | | | | | Add a for_each_string_list_item macroAlex Riesen2010-07-05
| |/ / / / / / /
* | | | | | | | Merge branch 'jh/graph-next-line'Junio C Hamano2010-08-18
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable custom schemes for column colors in the graph APIJohan Herland2010-07-13
| * | | | | | | | Make graph_next_line() available in the graph.h APIJohan Herland2010-07-13
* | | | | | | | | Merge branch 'tr/xsize-bits'Junio C Hamano2010-08-18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | xsize_t: check whether we lose bitsThomas Rast2010-07-28
* | | | | | | | | | Merge branch 'tc/checkout-B'Junio C Hamano2010-08-18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/checkout: handle -B from detached HEAD correctlyTay Ray Chuan2010-08-09
| * | | | | | | | | | builtin/checkout: learn -BTay Ray Chuan2010-06-25
| * | | | | | | | | | builtin/checkout: reword hint for -bTay Ray Chuan2010-06-25
| * | | | | | | | | | add tests for checkout -bTay Ray Chuan2010-06-25
* | | | | | | | | | | mergetool: Skip autoresolved pathsDavid Aguilar2010-08-17
* | | | | | | | | | | git-svn: fix fetch with deleted tagDavid D. Kilzer2010-08-15
* | | | | | | | | | | git-svn: fix regex to remove "tail" from svn tagsDavid D. Kilzer2010-08-15
* | | | | | | | | | | Merge branch 'jc/sha1-name-find-fix'Junio C Hamano2010-08-12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sha1_name.c: fix parsing of ":/token" syntaxJunio C Hamano2010-08-02
* | | | | | | | | | | | Merge branch 'jn/doc-pull'Junio C Hamano2010-08-12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: flesh out “git pull” descriptionJonathan Nieder2010-08-02
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |