summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/fix-abbrev'Junio C Hamano2010-08-185-4/+3
|\
| * examples/commit: use --abbrev for commit summaryJonathan Nieder2010-07-271-1/+1
| * checkout, commit: remove confusing assignments to rev.abbrevJonathan Nieder2010-07-272-2/+0
| * archive: abbreviate substituted commit ids againJonathan Nieder2010-07-272-1/+2
* | Merge branch 'vs/doc-spell'Junio C Hamano2010-08-189-16/+18
|\ \
| * | Documentation: spelling fixesVille Skyttä2010-07-209-16/+18
* | | Merge branch 'jh/use-test-must-fail'Junio C Hamano2010-08-1811-26/+26
|\ \ \
| * | | Convert "! git" to "test_must_fail git"Jared Hance2010-07-2011-26/+26
* | | | Merge branch 'jh/clean-exclude'Junio C Hamano2010-08-183-2/+39
|\ \ \ \
| * | | | Add test for git clean -e.Jared Hance2010-07-201-0/+16
| * | | | Add -e/--exclude to git-clean.Jared Hance2010-07-202-2/+23
| |/ / /
* | | | Merge branch 'kf/post-receive-sample-hook'Junio C Hamano2010-08-181-2/+32
|\ \ \ \
| * | | | post-receive-email: optional message line count limitKevin P. Fleming2010-07-161-2/+32
* | | | | Merge branch 'ab/report-corrupt-object-with-type'Junio C Hamano2010-08-181-2/+11
|\ \ \ \ \
| * | | | | sha1_file: Show the the type and path to corrupt objectsÆvar Arnfjörð Bjarmason2010-07-141-2/+11
* | | | | | Merge branch 'jn/rebase-rename-am'Junio C Hamano2010-08-185-202/+345
|\ \ \ \ \ \
| * | | | | | rebase: protect against diff.renames configurationJunio C Hamano2010-07-232-2/+24
| * | | | | | t3400 (rebase): whitespace cleanupJonathan Nieder2010-07-231-90/+92
| * | | | | | Teach "apply --index-info" to handle rename patchesJunio C Hamano2010-07-232-2/+47
| * | | | | | t4150 (am): futureproof against failing testsJonathan Nieder2010-07-231-1/+47
| * | | | | | t4150 (am): style fixJonathan Nieder2010-07-232-108/+136
* | | | | | | Merge branch 'jn/fast-import-subtree'Junio C Hamano2010-08-183-11/+75
|\ \ \ \ \ \ \
| * | | | | | | Teach fast-import to import subtrees named by tree idJonathan Nieder2010-07-053-11/+75
* | | | | | | | Merge branch 'ar/string-list-foreach'Junio C Hamano2010-08-185-104/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | Convert the users of for_each_string_list to for_each_string_list_item macroAlex Riesen2010-07-054-103/+64
| * | | | | | | | Add a for_each_string_list_item macroAlex Riesen2010-07-051-1/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'jh/graph-next-line'Junio C Hamano2010-08-182-23/+55
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable custom schemes for column colors in the graph APIJohan Herland2010-07-132-11/+43
| * | | | | | | | Make graph_next_line() available in the graph.h APIJohan Herland2010-07-132-12/+12
* | | | | | | | | Merge branch 'tr/xsize-bits'Junio C Hamano2010-08-181-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | xsize_t: check whether we lose bitsThomas Rast2010-07-281-0/+2
* | | | | | | | | | Merge branch 'tc/checkout-B'Junio C Hamano2010-08-184-9/+218
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/checkout: handle -B from detached HEAD correctlyTay Ray Chuan2010-08-092-1/+7
| * | | | | | | | | | builtin/checkout: learn -BTay Ray Chuan2010-06-253-7/+88
| * | | | | | | | | | builtin/checkout: reword hint for -bTay Ray Chuan2010-06-251-1/+2
| * | | | | | | | | | add tests for checkout -bTay Ray Chuan2010-06-251-0/+121
* | | | | | | | | | | mergetool: Skip autoresolved pathsDavid Aguilar2010-08-172-17/+57
* | | | | | | | | | | git-svn: fix fetch with deleted tagDavid D. Kilzer2010-08-153-2/+99
* | | | | | | | | | | git-svn: fix regex to remove "tail" from svn tagsDavid D. Kilzer2010-08-151-1/+1
* | | | | | | | | | | Merge branch 'jc/sha1-name-find-fix'Junio C Hamano2010-08-121-10/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sha1_name.c: fix parsing of ":/token" syntaxJunio C Hamano2010-08-021-10/+11
* | | | | | | | | | | | Merge branch 'jn/doc-pull'Junio C Hamano2010-08-121-11/+54
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: flesh out “git pull” descriptionJonathan Nieder2010-08-021-11/+54
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jn/maint-gitweb-dynconf'Junio C Hamano2010-08-121-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb: allow configurations that change with each requestJonathan Nieder2010-08-021-4/+4
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'bc/use-more-hardlinks-in-install'Junio C Hamano2010-08-121-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Makefile: make hard/symbolic links for non-builtins tooBrandon Casey2010-07-251-3/+6
| * | | | | | | | | | | | Makefile: link builtins residing in bin directory to main git binary tooBrandon Casey2010-07-251-0/+6
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'tr/rfc-reset-doc'Junio C Hamano2010-08-121-169/+178
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/reset: move "undo permanently" example behind "make topic"Thomas Rast2010-07-191-13/+13