Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+43 |
|\ | |||||
| * | fix "git apply --index ..." not to deref NULL | Jim Meyering | 2011-10-12 | 1 | -0/+43 |
* | | Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+42 |
|\ \ | |||||
| * | | checkout $tree $path: do not clobber local changes in $path not in $tree | Junio C Hamano | 2011-09-30 | 1 | -0/+42 |
| |/ | |||||
* | | Merge branch 'mm/maint-config-explicit-bool-display' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+6 |
|\ \ | |||||
| * | | config: display key_delim for config --bool --get-regexp | Matthieu Moy | 2011-10-10 | 1 | -0/+6 |
| |/ | |||||
* | | Merge branch 'bk/ancestry-path' into maint | Junio C Hamano | 2011-10-15 | 1 | -0/+38 |
|\ \ | |||||
| * | | t6019: avoid refname collision on case-insensitive systems | Thomas Rast | 2011-09-15 | 1 | -8/+11 |
| * | | revision: do not include sibling history in --ancestry-path output | Junio C Hamano | 2011-08-25 | 1 | -1/+1 |
| * | | rev-list: Demonstrate breakage with --ancestry-path --all | Brad King | 2011-08-25 | 1 | -0/+35 |
* | | | Merge branch 'tr/mergetool-valgrind' into maint | Junio C Hamano | 2011-10-15 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Symlink mergetools scriptlets into valgrind wrappers | Thomas Rast | 2011-08-30 | 1 | -0/+2 |
* | | | | Merge branch 'mm/rebase-i-exec-edit' into maint | Junio C Hamano | 2011-10-15 | 1 | -0/+14 |
|\ \ \ \ | |||||
| * | | | | rebase -i: clean error message for --continue after failed exec | Matthieu Moy | 2011-08-26 | 1 | -0/+14 |
| * | | | | Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maint | Junio C Hamano | 2011-08-23 | 1 | -0/+5 |
| |\ \ \ \ | |||||
* | | | | | | t1304: fall back to $USER if $LOGNAME is not defined | René Scharfe | 2011-10-14 | 1 | -0/+5 |
* | | | | | | Merge branch 'ph/format-patch-no-color' | Junio C Hamano | 2011-09-19 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t4014: clean up format.thread config after each test | Jeff King | 2011-09-19 | 1 | -4/+4 |
* | | | | | | | Merge branch 'ci/forbid-unwanted-current-branch-update' | Junio C Hamano | 2011-09-16 | 1 | -0/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | branch --set-upstream: regression fix | Junio C Hamano | 2011-09-16 | 1 | -0/+13 |
* | | | | | | | | Disambiguate duplicate t9160* tests | Frédéric Heitzmann | 2011-09-16 | 2 | -1/+1 |
* | | | | | | | | Merge branch 'ph/format-patch-no-color' | Junio C Hamano | 2011-09-14 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | format-patch: ignore ui.color | Pang Yan Han | 2011-09-12 | 1 | -0/+8 |
* | | | | | | | | git-svn: teach git-svn to populate svn:mergeinfo | Bryan Jacobs | 2011-09-13 | 2 | -0/+478 |
* | | | | | | | | Merge branch 'cb/maint-ls-files-error-report' | Junio C Hamano | 2011-09-06 | 1 | -10/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t3005: do not assume a particular order of stdout and stderr of git-ls-files | Johannes Sixt | 2011-08-28 | 1 | -10/+12 |
* | | | | | | | | | Merge branch 'mh/check-ref-format-print-normalize' | Junio C Hamano | 2011-09-06 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Forbid DEL characters in reference names | Michael Haggerty | 2011-08-27 | 1 | -0/+3 |
| * | | | | | | | | | check-ref-format --print: Normalize refnames that start with slashes | Michael Haggerty | 2011-08-25 | 1 | -0/+6 |
* | | | | | | | | | | Merge branch 'tr/maint-t3903-misquoted-command' | Junio C Hamano | 2011-09-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t3903: fix misquoted rev-parse invocation | Thomas Rast | 2011-08-30 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'bc/bisect-test-use-shell-path' | Junio C Hamano | 2011-09-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh | Brandon Casey | 2011-08-30 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'va/p4-branch-import-test-update' | Junio C Hamano | 2011-09-02 | 1 | -11/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-p4: simple branch tests edits | Pete Wyckoff | 2011-08-29 | 1 | -11/+8 |
* | | | | | | | | | | | | | Merge branch 'tr/maint-format-patch-empty-output' | Junio C Hamano | 2011-09-02 | 1 | -3/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t4014: "no-add-headers" is actually called "no-add-header" | Thomas Rast | 2011-08-29 | 1 | -2/+2 |
| * | | | | | | | | | | | | | t4014: invoke format-patch with --stdout where intended | Thomas Rast | 2011-08-29 | 1 | -2/+2 |
| * | | | | | | | | | | | | | t4014: check for empty files from git format-patch --stdout | Thomas Rast | 2011-08-29 | 1 | -2/+19 |
* | | | | | | | | | | | | | | Merge branch 'bg/t5540-osx-grep' | Junio C Hamano | 2011-09-02 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t5540-http-test: shorten grep pattern | Brian Gernhardt | 2011-08-28 | 1 | -2/+6 |
* | | | | | | | | | | | | | | | Merge branch 'fg/submodule-ff-check-before-push' | Junio C Hamano | 2011-09-02 | 1 | -0/+87 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | push: Don't push a repository with unpushed submodules | Fredrik Gustafsson | 2011-08-20 | 1 | -0/+87 |
* | | | | | | | | | | | | | | | | Merge branch 'fk/use-kwset-pickaxe-grep-f' | Junio C Hamano | 2011-09-02 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Use kwset in grep | Fredrik Kuivinen | 2011-08-20 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | Merge branch 'en/merge-recursive-2' | Junio C Hamano | 2011-09-02 | 5 | -46/+1454 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest | Elijah Newren | 2011-08-14 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify | Elijah Newren | 2011-08-14 | 1 | -0/+69 |
| * | | | | | | | | | | | | | | | | | merge-recursive: Avoid unnecessary file rewrites | Elijah Newren | 2011-08-14 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | | t6022: Additional tests checking for unnecessary updates of files | Elijah Newren | 2011-08-14 | 1 | -0/+91 |