summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | notes-merge: use opendir/readdir instead of using read_directory()Johan Herland2012-03-152-21/+31
| * | | | | | | | | | | | | | | t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/Johan Herland2012-03-151-0/+19
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | remove_dir_recursively(): Add flag for skipping removal of toplevel dirJunio C Hamano2012-03-152-4/+11
* | | | | | | | | | | | | | | Merge branch 'tr/maint-word-diff-regex-sticky'Junio C Hamano2012-04-152-56/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | diff: tweak a _copy_ of diff_options with word-difftr/maint-word-diff-regex-stickyThomas Rast2012-03-142-2/+5
| * | | | | | | | | | | | | | | diff: refactor the word-diff setup from builtin_diff_cmdThomas Rast2012-03-141-56/+63
| * | | | | | | | | | | | | | | t4034: diff.*.wordregex should not be "sticky" in --word-diffJohannes Sixt2012-03-141-0/+36
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jn/diffstat-tests'Junio C Hamano2012-04-1516-259/+354
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | diffstat summary line varies by locale: miscellanyjn/diffstat-testsJonathan Nieder2012-03-138-64/+96
| * | | | | | | | | | | | | | | test: use numstat instead of diffstat in binary-diff testJonathan Nieder2012-03-131-6/+23
| * | | | | | | | | | | | | | | test: use --numstat instead of --stat in "git stash show" testsJonathan Nieder2012-03-131-7/+19
| * | | | | | | | | | | | | | | test: test cherry-pick functionality and output separatelyJonathan Nieder2012-03-131-8/+22
| * | | | | | | | | | | | | | | test: modernize funny-names test styleJonathan Nieder2012-03-131-167/+180
| * | | | | | | | | | | | | | | test: use numstat instead of diffstat in funny-names testJonathan Nieder2012-03-131-10/+17
| * | | | | | | | | | | | | | | test: use test_i18ncmp when checking --stat outputJonathan Nieder2012-03-138-16/+16
* | | | | | | | | | | | | | | | Merge branch 'jc/diff-algo-cleanup'Junio C Hamano2012-04-158-25/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanupJunio C Hamano2012-02-198-20/+24
| * | | | | | | | | | | | | | | | xdiff: remove XDL_PATCH_* macrosJunio C Hamano2012-02-191-5/+0
* | | | | | | | | | | | | | | | | Merge branch 'jc/commit-hook-authorship'Junio C Hamano2012-04-155-47/+141
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | commit: pass author/committer info to hooksjc/commit-hook-authorshipJunio C Hamano2012-03-112-4/+20
| * | | | | | | | | | | | | | | | | t7503: does pre-commit-hook learn authorship?Junio C Hamano2012-03-111-0/+18
| * | | | | | | | | | | | | | | | | ident.c: add split_ident_line() to parse formatted ident lineJunio C Hamano2012-03-113-44/+104
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'nd/stream-more'Junio C Hamano2012-04-1511-75/+221
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | update-server-info: respect core.bigfilethresholdnd/stream-moreNguyễn Thái Ngọc Duy2012-03-072-1/+2
| * | | | | | | | | | | | | | | | | fsck: use streaming API for writing lost-found blobsNguyễn Thái Ngọc Duy2012-03-071-6/+2
| * | | | | | | | | | | | | | | | | show: use streaming API for showing blobsNguyễn Thái Ngọc Duy2012-03-072-15/+21
| * | | | | | | | | | | | | | | | | parse_object: avoid putting whole blob in coreNguyễn Thái Ngọc Duy2012-03-072-2/+51
| * | | | | | | | | | | | | | | | | cat-file: use streaming API to print blobsNguyễn Thái Ngọc Duy2012-03-072-2/+27
| * | | | | | | | | | | | | | | | | Add more large blob test casesNguyễn Thái Ngọc Duy2012-03-072-5/+60
| * | | | | | | | | | | | | | | | | streaming: make streaming-write-entry to be more reusableJunio C Hamano2012-03-073-48/+62
* | | | | | | | | | | | | | | | | | merge overwrites unstaged changes in renamed fileClemens Buchacher2012-04-151-0/+9
* | | | | | | | | | | | | | | | | | Kick off post 1.7.10 cycleJunio C Hamano2012-04-113-2/+31
* | | | | | | | | | | | | | | | | | gitweb: Fix unintended "--no-merges" for regular Atom feedSebastian Pipping2012-04-111-0/+1
* | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-04-102-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.9' into maintJunio C Hamano2012-04-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.8' into maint-1.7.9Junio C Hamano2012-04-102-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8Junio C Hamano2012-04-091-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8Junio C Hamano2012-04-091-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/cache-tree' into maint-1.7.8Junio C Hamano2012-04-0910-11/+142
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8Junio C Hamano2012-04-092-4/+33
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8Junio C Hamano2012-04-091-6/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8Junio C Hamano2012-04-092-23/+36
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8Junio C Hamano2012-04-095-51/+67
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/rerere-doc' into maint-1.7.8Junio C Hamano2012-04-091-7/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | test-subprocess: fix segfault without argumentsRené Scharfe2012-04-101-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: fix prototype of gitmodules_configRené Scharfe2012-04-101-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix git-subtree install instructionsDavid A. Greene2012-04-091-12/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use git-subtree test MakefileDavid A. Greene2012-04-091-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add subtree test MakefileDavid A. Greene2012-04-091-0/+69
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install git-subtree from contribDavid A. Greene2012-04-091-20/+21