Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/pretty-G-format-fixes' | Junio C Hamano | 2014-07-09 |
|\ | |||
| * | move "%G" format test from t7510 to t6006 | Jeff King | 2014-06-25 |
| * | pretty: avoid reading past end-of-string with "%G" | Jeff King | 2014-06-17 |
| * | t7510: check %G* pretty-format output | Jeff King | 2014-06-17 |
| * | t7510: test a commit signed by an unknown key | Jeff King | 2014-06-17 |
| * | t7510: use consistent &&-chains in loop | Michael J Gruber | 2014-06-17 |
| * | t7510: stop referring to master in later tests | Jeff King | 2014-06-17 |
* | | Merge branch 'dt/refs-check-refname-component-sse' | Junio C Hamano | 2014-07-02 |
|\ \ | |||
| * | | refs.c: SSE2 optimizations for check_refname_component | David Turner | 2014-06-18 |
* | | | Merge branch 'ye/http-extract-charset' | Junio C Hamano | 2014-07-02 |
|\ \ \ | |||
| * | | | http: fix charset detection of extract_content_type() | Yi EungJun | 2014-06-17 |
* | | | | Merge branch 'bc/fix-rebase-merge-skip' | Junio C Hamano | 2014-07-02 |
|\ \ \ \ | |||
| * | | | | rebase--merge: fix --skip with two conflicts in a row | brian m. carlson | 2014-06-16 |
| * | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-28 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'mw/symlinks' into maint | Junio C Hamano | 2014-05-28 |
| |\ \ \ \ \ | |||
* | \ \ \ \ \ | Merge branch 'maint' | Junio C Hamano | 2014-07-02 |
|\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'maint-1.8.5' into maint | Junio C Hamano | 2014-07-02 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | t7300: repair filesystem permissions with test_when_finished | Jeff King | 2014-07-02 |
| * | | | | | | | | Merge branch 'na/no-http-test-in-the-middle' into maint | Junio C Hamano | 2014-06-25 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'jl/status-added-submodule-is-never-ignored' into maint | Junio C Hamano | 2014-06-25 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint | Junio C Hamano | 2014-06-25 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rr/rebase-autostash-fix' into maint | Junio C Hamano | 2014-06-25 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/shortlog-ref-exclude' into maint | Junio C Hamano | 2014-06-25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dt/merge-recursive-case-insensitive' into maint | Junio C Hamano | 2014-06-25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-files-assume-unchanged' into maint | Junio C Hamano | 2014-06-25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/commit-C-pick-empty' into maint | Junio C Hamano | 2014-06-25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/blame-crlf-test' into maint | Junio C Hamano | 2014-06-25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ignore-whitespace' into maint | Junio C Hamano | 2014-06-25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'as/pretty-truncate' into maint | Junio C Hamano | 2014-06-25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint | Junio C Hamano | 2014-06-12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ep/avoid-test-a-o' | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 |
| * | | | | | | | | | | | | | | | | | | | | t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 |
| * | | | | | | | | | | | | | | | | | | | | t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 |
| * | | | | | | | | | | | | | | | | | | | | t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 |
| * | | | | | | | | | | | | | | | | | | | | t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 |
| * | | | | | | | | | | | | | | | | | | | | t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 |
| * | | | | | | | | | | | | | | | | | | | | t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 |
| * | | | | | | | | | | | | | | | | | | | | t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 |
| * | | | | | | | | | | | | | | | | | | | | t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'pb/trim-trailing-spaces' | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | t0008: do not depend on 'echo' handling backslashes specially | Junio C Hamano | 2014-06-13 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sp/complete-ext-alias' | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases | Steffen Prohaska | 2014-06-13 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/repack-pack-writebitmaps-config' | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | t7700: drop explicit --no-pack-kept-objects from .keep test | Jeff King | 2014-06-12 |
| * | | | | | | | | | | | | | | | | | | | | | | | repack: introduce repack.writeBitmaps config option | Jeff King | 2014-06-10 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/init-restore-env' | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | git potty: restore environments after alias expansion | Nguyễn Thái Ngọc Duy | 2014-06-10 |
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects' | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |