Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | configure: avoid some code repetitions thanks to m4_{push,pop}def | Stefano Lattarini | 2012-03-26 | 1 | -12/+14 | |
| * | | | | | | | | | | | | configure: move definitions of private m4 macros before AC_INIT invocation | Stefano Lattarini | 2012-03-26 | 1 | -12/+13 | |
* | | | | | | | | | | | | | Merge branch 'jk/branch-quiet' | Junio C Hamano | 2012-04-16 | 5 | -11/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | teach "git branch" a --quiet optionjk/branch-quiet | Jeff King | 2012-03-26 | 2 | -6/+15 | |
| * | | | | | | | | | | | | | checkout: suppress tracking message with "-q" | Jeff King | 2012-03-26 | 4 | -6/+8 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'rs/combine-diff-zero-context-at-the-beginning' | Junio C Hamano | 2012-04-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | combine-diff: fix loop index underflowrs/combine-diff-zero-context-at-the-beginning | René Scharfe | 2012-03-25 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge branch 'jk/diff-no-rename-empty' | Junio C Hamano | 2012-04-16 | 9 | -14/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | merge-recursive: don't detect renames of empty filesjk/diff-no-rename-empty | Jeff King | 2012-03-23 | 2 | -0/+17 | |
| * | | | | | | | | | | | | | | teach diffcore-rename to optionally ignore empty content | Jeff King | 2012-03-23 | 3 | -1/+12 | |
| * | | | | | | | | | | | | | | make is_empty_blob_sha1 available everywhere | Jeff King | 2012-03-23 | 2 | -10/+13 | |
| * | | | | | | | | | | | | | | drop casts from users EMPTY_TREE_SHA1_BIN | Jeff King | 2012-03-23 | 3 | -3/+3 | |
* | | | | | | | | | | | | | | | Merge branch 'jc/maint-clean-nested-worktree-in-subdir' | Junio C Hamano | 2012-04-16 | 2 | -11/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | clean: preserve nested git worktree in subdirectoriesjc/maint-clean-nested-worktree-in-subdir | Junio C Hamano | 2012-03-15 | 2 | -11/+43 | |
* | | | | | | | | | | | | | | | | Merge branch 'rs/unpack-trees-leakfix' | Junio C Hamano | 2012-04-16 | 1 | -10/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | unpack-trees: plug minor memory leak | René Scharfe | 2012-04-10 | 1 | -9/+16 | |
| * | | | | | | | | | | | | | | | | unpack-trees: don't perform any index operation if we're not merging | René Scharfe | 2012-04-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | Merge branch 'nl/rebase-i-cheat-sheet' | Junio C Hamano | 2012-04-16 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | rebase -i: remind that the lines are top-to-bottomnl/rebase-i-cheat-sheet | Junio C Hamano | 2012-03-20 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | | RelNotes: the first batch of topics graduated to 'master' | Junio C Hamano | 2012-04-15 | 1 | -0/+19 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool-test' | Junio C Hamano | 2012-04-15 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | t7800: Test difftool passing arguments to diffda/difftool-test | David Aguilar | 2012-03-19 | 1 | -0/+11 | |
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'zj/test-cred-helper-nicer-prove' | Junio C Hamano | 2012-04-15 | 1 | -24/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | t0303: resurrect commit message as test documentationzj/test-cred-helper-nicer-prove | Zbigniew Jędrzejewski-Szmek | 2012-03-15 | 1 | -1/+29 | |
| * | | | | | | | | | | | | | | | | | | t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER | Zbigniew Jędrzejewski-Szmek | 2012-03-15 | 1 | -23/+16 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jh/notes-merge-in-git-dir-worktree' | Junio C Hamano | 2012-04-15 | 4 | -32/+73 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktree | Johan Herland | 2012-03-15 | 2 | -8/+13 | |
| * | | | | | | | | | | | | | | | | | | | notes-merge: use opendir/readdir instead of using read_directory() | Johan Herland | 2012-03-15 | 2 | -21/+31 | |
| * | | | | | | | | | | | | | | | | | | | t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ | Johan Herland | 2012-03-15 | 1 | -0/+19 | |
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | remove_dir_recursively(): Add flag for skipping removal of toplevel dir | Junio C Hamano | 2012-03-15 | 2 | -4/+11 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-word-diff-regex-sticky' | Junio C Hamano | 2012-04-15 | 2 | -56/+102 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | diff: tweak a _copy_ of diff_options with word-difftr/maint-word-diff-regex-sticky | Thomas Rast | 2012-03-14 | 2 | -2/+5 | |
| * | | | | | | | | | | | | | | | | | | | diff: refactor the word-diff setup from builtin_diff_cmd | Thomas Rast | 2012-03-14 | 1 | -56/+63 | |
| * | | | | | | | | | | | | | | | | | | | t4034: diff.*.wordregex should not be "sticky" in --word-diff | Johannes Sixt | 2012-03-14 | 1 | -0/+36 | |
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jn/diffstat-tests' | Junio C Hamano | 2012-04-15 | 16 | -259/+354 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | diffstat summary line varies by locale: miscellanyjn/diffstat-tests | Jonathan Nieder | 2012-03-13 | 8 | -64/+96 | |
| * | | | | | | | | | | | | | | | | | | | test: use numstat instead of diffstat in binary-diff test | Jonathan Nieder | 2012-03-13 | 1 | -6/+23 | |
| * | | | | | | | | | | | | | | | | | | | test: use --numstat instead of --stat in "git stash show" tests | Jonathan Nieder | 2012-03-13 | 1 | -7/+19 | |
| * | | | | | | | | | | | | | | | | | | | test: test cherry-pick functionality and output separately | Jonathan Nieder | 2012-03-13 | 1 | -8/+22 | |
| * | | | | | | | | | | | | | | | | | | | test: modernize funny-names test style | Jonathan Nieder | 2012-03-13 | 1 | -167/+180 | |
| * | | | | | | | | | | | | | | | | | | | test: use numstat instead of diffstat in funny-names test | Jonathan Nieder | 2012-03-13 | 1 | -10/+17 | |
| * | | | | | | | | | | | | | | | | | | | test: use test_i18ncmp when checking --stat output | Jonathan Nieder | 2012-03-13 | 8 | -16/+16 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-algo-cleanup' | Junio C Hamano | 2012-04-15 | 8 | -25/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanup | Junio C Hamano | 2012-02-19 | 8 | -20/+24 | |
| * | | | | | | | | | | | | | | | | | | | | xdiff: remove XDL_PATCH_* macros | Junio C Hamano | 2012-02-19 | 1 | -5/+0 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/commit-hook-authorship' | Junio C Hamano | 2012-04-15 | 5 | -47/+141 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | commit: pass author/committer info to hooksjc/commit-hook-authorship | Junio C Hamano | 2012-03-11 | 2 | -4/+20 | |
| * | | | | | | | | | | | | | | | | | | | | | t7503: does pre-commit-hook learn authorship? | Junio C Hamano | 2012-03-11 | 1 | -0/+18 | |
| * | | | | | | | | | | | | | | | | | | | | | ident.c: add split_ident_line() to parse formatted ident line | Junio C Hamano | 2012-03-11 | 3 | -44/+104 | |
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/stream-more' | Junio C Hamano | 2012-04-15 | 11 | -75/+221 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |