Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'js/no-cherry-pick-head-after-punted' | Junio C Hamano | 2011-10-19 |
|\ | |||
| * | Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi... | Junio C Hamano | 2011-10-06 |
| |\ | |||
| | * | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so | Jay Soffian | 2011-10-06 |
* | | | Merge branch 'bk/submodule-in-recursive-merge' | Junio C Hamano | 2011-10-19 |
|\ \ \ | |||
| * | | | submodule: Search for merges only at end of recursive merge | Brad King | 2011-10-13 |
| * | | | submodule: Demonstrate known breakage during recursive merge | Brad King | 2011-10-13 |
* | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' | Junio C Hamano | 2011-10-19 |
|\ \ \ \ | |||
| * | | | | fix "git apply --index ..." not to deref NULL | Jim Meyering | 2011-10-12 |
* | | | | | Merge branch 'jk/config-test-cleanup' | Junio C Hamano | 2011-10-19 |
|\ \ \ \ \ | |||
| * | | | | | t1300: attempting to remove a non-existent .git/config is not an error | Johannes Sixt | 2011-10-19 |
* | | | | | | Merge branch 'cb/httpd-test-fix-port' | Junio C Hamano | 2011-10-18 |
|\ \ \ \ \ \ | |||
| * | | | | | | use test number as port number | Clemens Buchacher | 2011-10-17 |
* | | | | | | | Merge branch 'pt/mingw-misc-fixes' | Junio C Hamano | 2011-10-18 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t9901: fix line-ending dependency on windows | Pat Thoyts | 2011-10-15 |
| * | | | | | | | t9300: do not run --cat-blob-fd related tests on MinGW | Johannes Schindelin | 2011-10-14 |
| * | | | | | | | t9001: do not fail only due to CR/LF issues | Johannes Schindelin | 2011-10-14 |
| * | | | | | | | t1020: disable the pwd test on MinGW | Johannes Schindelin | 2011-10-14 |
* | | | | | | | | Merge branch 'jk/http-auth' | Junio C Hamano | 2011-10-17 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | http: use hostname in credential description | Michael J Gruber | 2011-10-15 |
| * | | | | | | | | improve httpd auth tests | Jeff King | 2011-07-20 |
* | | | | | | | | | Merge branch 'js/check-ref-format-test-mingw' | Junio C Hamano | 2011-10-17 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t1402-check-ref-format: skip tests of refs beginning with slash on Windows | Johannes Sixt | 2011-10-13 |
* | | | | | | | | | | Merge branch 'jk/config-test-cleanup' | Junio C Hamano | 2011-10-17 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | t1300: test mixed-case variable retrieval | Jeff King | 2011-10-12 |
| * | | | | | | | | | t1300: put git invocations inside test function | Jeff King | 2011-10-12 |
* | | | | | | | | | | Merge branch 'bc/attr-ignore-case' | Junio C Hamano | 2011-10-17 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | attr.c: respect core.ignorecase when matching attribute patterns | Brandon Casey | 2011-10-11 |
* | | | | | | | | | | | Merge branch 'mm/maint-config-explicit-bool-display' | Junio C Hamano | 2011-10-17 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | config: display key_delim for config --bool --get-regexp | Matthieu Moy | 2011-10-10 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'ph/push-to-delete-nothing' | Junio C Hamano | 2011-10-17 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | receive-pack: don't pass non-existent refs to post-{receive,update} hooks | Pang Yan Han | 2011-09-30 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes' | Junio C Hamano | 2011-10-17 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | checkout $tree $path: do not clobber local changes in $path not in $tree | Junio C Hamano | 2011-09-30 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | resolve_gitlink_packed_ref(): fix mismerge | Junio C Hamano | 2011-10-17 |
* | | | | | | | | | | | git svn dcommit: new option --interactive. | Frédéric Heitzmann | 2011-10-16 |
| |_|_|_|_|/ / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | send-email: Fix %config_path_settings handling | Cord Seele | 2011-10-14 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-10-14 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t1304: fall back to $USER if $LOGNAME is not defined | René Scharfe | 2011-10-14 |
| | |/ / / / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'jc/grep-untracked-exclude' | Junio C Hamano | 2011-10-13 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude | Junio C Hamano | 2011-10-04 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||
| | * | | | | | | | | | grep: teach --untracked and --exclude-standard options | Junio C Hamano | 2011-10-04 |
* | | | | | | | | | | | Merge branch 'rs/pending' | Junio C Hamano | 2011-10-13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | checkout: check for "Previous HEAD" notice in t2020 | René Scharfe | 2011-10-03 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'cp/git-web-browse-browsers' | Junio C Hamano | 2011-10-13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | git-web--browse: avoid the use of eval | Chris Packham | 2011-10-03 |
| |/ / / / / / / / / / | |||
* | | | | | | | | | | | Merge branch 'di/fast-import-empty-tag-note-fix' | Junio C Hamano | 2011-10-13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | fast-import: don't allow to note on empty branch | Dmitry Ivankov | 2011-09-22 |
| * | | | | | | | | | | | fast-import: don't allow to tag empty branch | Dmitry Ivankov | 2011-09-22 |
* | | | | | | | | | | | | Merge branch 'bw/grep-no-index-no-exclude' | Junio C Hamano | 2011-10-13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | grep --no-index: don't use git standard exclusions | Bert Wesarg | 2011-09-15 |