Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/config-test-cleanup' | Junio C Hamano | 2011-10-17 | 1 | -83/+120 |
|\ | |||||
| * | t1300: test mixed-case variable retrieval | Jeff King | 2011-10-12 | 1 | -0/+27 |
| * | t1300: put git invocations inside test function | Jeff King | 2011-10-12 | 1 | -83/+93 |
* | | Merge branch 'bc/attr-ignore-case' | Junio C Hamano | 2011-10-17 | 1 | -1/+58 |
|\ \ | |||||
| * | | attr.c: respect core.ignorecase when matching attribute patterns | Brandon Casey | 2011-10-11 | 1 | -1/+58 |
* | | | Merge branch 'mm/maint-config-explicit-bool-display' | Junio C Hamano | 2011-10-17 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | config: display key_delim for config --bool --get-regexp | Matthieu Moy | 2011-10-10 | 1 | -0/+6 |
* | | | | Merge branch 'ph/push-to-delete-nothing' | Junio C Hamano | 2011-10-17 | 1 | -0/+197 |
|\ \ \ \ | |||||
| * | | | | receive-pack: don't pass non-existent refs to post-{receive,update} hooksph/push-to-delete-nothing | Pang Yan Han | 2011-09-30 | 1 | -0/+197 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes' | Junio C Hamano | 2011-10-17 | 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 |
| | |/ / | |/| | | |||||
* | | | | resolve_gitlink_packed_ref(): fix mismerge | Junio C Hamano | 2011-10-17 | 1 | -0/+19 |
* | | | | git svn dcommit: new option --interactive. | Frédéric Heitzmann | 2011-10-16 | 1 | -0/+64 |
* | | | | send-email: Fix %config_path_settings handling | Cord Seele | 2011-10-14 | 1 | -0/+28 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2011-10-14 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | t1304: fall back to $USER if $LOGNAME is not defined | René Scharfe | 2011-10-14 | 1 | -0/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jc/grep-untracked-exclude' | Junio C Hamano | 2011-10-13 | 1 | -1/+33 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude | Junio C Hamano | 2011-10-04 | 1 | -1/+33 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | grep: teach --untracked and --exclude-standard options | Junio C Hamano | 2011-10-04 | 1 | -1/+33 |
* | | | | | Merge branch 'rs/pending' | Junio C Hamano | 2011-10-13 | 1 | -2/+5 |
|\ \ \ \ \ | |||||
| * | | | | | checkout: check for "Previous HEAD" notice in t2020 | René Scharfe | 2011-10-03 | 1 | -2/+5 |
* | | | | | | Merge branch 'cp/git-web-browse-browsers' | Junio C Hamano | 2011-10-13 | 1 | -0/+66 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-web--browse: avoid the use of evalcp/git-web-browse-browsers | Chris Packham | 2011-10-03 | 1 | -0/+66 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'di/fast-import-empty-tag-note-fix' | Junio C Hamano | 2011-10-13 | 1 | -0/+29 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fast-import: don't allow to note on empty branchdi/fast-import-empty-tag-note-fix | Dmitry Ivankov | 2011-09-22 | 1 | -0/+17 |
| * | | | | | | fast-import: don't allow to tag empty branch | Dmitry Ivankov | 2011-09-22 | 1 | -0/+12 |
* | | | | | | | Merge branch 'bw/grep-no-index-no-exclude' | Junio C Hamano | 2011-10-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | grep --no-index: don't use git standard exclusionsbw/grep-no-index-no-exclude | Bert Wesarg | 2011-09-15 | 1 | -1/+1 |
* | | | | | | | Merge branch 'nd/maint-sparse-errors' | Junio C Hamano | 2011-10-13 | 1 | -0/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sparse checkout: show error messages when worktree shaping fails | Nguyễn Thái Ngọc Duy | 2011-09-22 | 1 | -0/+15 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/parse-options-boolean' | Junio C Hamano | 2011-10-12 | 2 | -1/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | parseopt: add OPT_NOOP_NOARG | René Scharfe | 2011-09-28 | 1 | -1/+1 |
| * | | | | | | | archive.c: use OPT_BOOL() | Junio C Hamano | 2011-09-27 | 1 | -0/+9 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | t5403: convert leading spaces to tabs | Nguyễn Thái Ngọc Duy | 2011-10-12 | 1 | -23/+23 |
* | | | | | | | Merge branch 'mh/check-ref-format-3' | Junio C Hamano | 2011-10-10 | 1 | -13/+107 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Change check_refname_format() to reject unnormalized refnames | Michael Haggerty | 2011-10-05 | 1 | -8/+23 |
| * | | | | | | | Do not allow ".lock" at the end of any refname component | Michael Haggerty | 2011-10-05 | 1 | -4/+4 |
| * | | | | | | | Change check_ref_format() to take a flags argument | Michael Haggerty | 2011-10-05 | 1 | -5/+1 |
| * | | | | | | | git check-ref-format: add options --allow-onelevel and --refspec-pattern | Michael Haggerty | 2011-10-05 | 1 | -7/+81 |
| * | | | | | | | t1402: add some more tests | Michael Haggerty | 2011-10-05 | 1 | -0/+9 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'jm/mergetool-pathspec' | Junio C Hamano | 2011-10-10 | 1 | -18/+40 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mergetool: Use args as pathspec to unmerged files | Jonathon Mah | 2011-09-26 | 1 | -18/+40 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mz/remote-rename' | Junio C Hamano | 2011-10-10 | 1 | -0/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remote: only update remote-tracking branch if updating refspec | Martin von Zweigbergk | 2011-09-11 | 1 | -1/+2 |
| * | | | | | | | remote: "rename o foo" should not rename ref "origin/bar" | Martin von Zweigbergk | 2011-09-11 | 1 | -0/+10 |
| * | | | | | | | remote: write correct fetch spec when renaming remote 'remote' | Martin von Zweigbergk | 2011-09-11 | 1 | -0/+20 |
* | | | | | | | | Merge branch 'hv/submodule-update-none' | Junio C Hamano | 2011-10-10 | 1 | -0/+62 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add update 'none' flag to disable update of submodule by default | Heiko Voigt | 2011-08-11 | 1 | -0/+62 |
* | | | | | | | | | Merge branch 'fg/submodule-git-file-git-dir' | Junio C Hamano | 2011-10-10 | 5 | -56/+167 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Move git-dir for submodulesfg/submodule-git-file-git-dir | Fredrik Gustafsson | 2011-08-22 | 2 | -2/+109 |