summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-169-14/+45
|\
| * merge-recursive: don't detect renames of empty filesjk/diff-no-rename-emptyJeff King2012-03-232-0/+17
| * teach diffcore-rename to optionally ignore empty contentJeff King2012-03-233-1/+12
| * make is_empty_blob_sha1 available everywhereJeff King2012-03-232-10/+13
| * drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-233-3/+3
* | Merge branch 'jc/maint-clean-nested-worktree-in-subdir'Junio C Hamano2012-04-162-11/+43
|\ \
| * | clean: preserve nested git worktree in subdirectoriesjc/maint-clean-nested-worktree-in-subdirJunio C Hamano2012-03-152-11/+43
* | | Merge branch 'rs/unpack-trees-leakfix'Junio C Hamano2012-04-161-10/+17
|\ \ \
| * | | unpack-trees: plug minor memory leakRené Scharfe2012-04-101-9/+16
| * | | unpack-trees: don't perform any index operation if we're not mergingRené Scharfe2012-04-101-1/+1
* | | | Merge branch 'nl/rebase-i-cheat-sheet'Junio C Hamano2012-04-161-0/+2
|\ \ \ \
| * | | | rebase -i: remind that the lines are top-to-bottomnl/rebase-i-cheat-sheetJunio C Hamano2012-03-201-0/+2
* | | | | RelNotes: the first batch of topics graduated to 'master'Junio C Hamano2012-04-151-0/+19
* | | | | Merge branch 'da/difftool-test'Junio C Hamano2012-04-151-0/+11
|\ \ \ \ \
| * | | | | t7800: Test difftool passing arguments to diffda/difftool-testDavid Aguilar2012-03-191-0/+11
* | | | | | Merge branch 'zj/test-cred-helper-nicer-prove'Junio C Hamano2012-04-151-24/+45
|\ \ \ \ \ \
| * | | | | | t0303: resurrect commit message as test documentationzj/test-cred-helper-nicer-proveZbigniew Jędrzejewski-Szmek2012-03-151-1/+29
| * | | | | | t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPERZbigniew Jędrzejewski-Szmek2012-03-151-23/+16
* | | | | | | Merge branch 'jh/notes-merge-in-git-dir-worktree'Junio C Hamano2012-04-154-32/+73
|\ \ \ \ \ \ \
| * | | | | | | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktreeJohan Herland2012-03-152-8/+13
| * | | | | | | 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
View Lorry Controller Status