Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | patch-ids: make commit_patch_id() a public helper function | Xiaolong Ye | 2016-04-26 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'tb/core-eol-fix' | Junio C Hamano | 2016-05-23 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | convert.c: ident + core.autocrlf didn't work | Torsten Bögershausen | 2016-04-25 | |
| * | | | | | | | | | | t0027: test cases for combined attributes | Torsten Bögershausen | 2016-04-25 | |
| * | | | | | | | | | | convert: allow core.autocrlf=input and core.eol=crlf | Torsten Bögershausen | 2016-04-25 | |
| * | | | | | | | | | | t0027: make commit_chk_wrnNNO() reliable | Torsten Bögershausen | 2016-04-25 | |
| |/ / / / / / / / / | ||||
* | | | | | | | | | | Merge branch 'nd/worktree-various-heads' | Junio C Hamano | 2016-05-23 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | branch: do not rename a branch under bisect or rebase | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
| * | | | | | | | | | | worktree.c: check whether branch is bisected in another worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
| * | | | | | | | | | | wt-status.c: split bisect detection out of wt_status_get_state() | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
| * | | | | | | | | | | worktree.c: check whether branch is rebased in another worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
| * | | | | | | | | | | worktree.c: avoid referencing to worktrees[i] multiple times | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
| * | | | | | | | | | | wt-status.c: make wt_status_check_rebase() work on any worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
| * | | | | | | | | | | wt-status.c: split rebase detection out of wt_status_get_state() | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
| * | | | | | | | | | | path.c: refactor and add worktree_git_path() | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
| * | | | | | | | | | | worktree.c: mark current worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
| * | | | | | | | | | | worktree.c: make find_shared_symref() return struct worktree * | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
| * | | | | | | | | | | worktree.c: store "id" instead of "git_dir" | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
| * | | | | | | | | | | path.c: add git_common_path() and strbuf_git_common_path() | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
| * | | | | | | | | | | dir.c: rename str(n)cmp_icase to fspath(n)cmp | Nguyễn Thái Ngọc Duy | 2016-04-22 | |
* | | | | | | | | | | | Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op' | Junio C Hamano | 2016-05-23 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | ||||
| * | | | | | | | | | | wt-status.c: set commitable bit if there is a meaningful merge. | Stephen P. Smith | 2016-02-17 | |
* | | | | | | | | | | | Sync with 2.8.3 | Junio C Hamano | 2016-05-18 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | Git 2.8.3v2.8.3 | Junio C Hamano | 2016-05-18 | |
| * | | | | | | | | | | | Merge branch 'sb/misc-cleanups' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/doc-split-pack-disables-bitmap' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/clean-test-fix' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rn/glossary-typofix' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/normal-to-e' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/config-exit-status-list' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rt/string-list-lookup-cleanup' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/test-lib-simplify-expr-away' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/remove-unused' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sk/gitweb-highlight-encoding' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/travis-submitting-patches' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/close-packs-before-gc' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-lfs' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nf/mergetool-prompt' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jd/send-email-to-whom' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/win32-mmap' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-client-deadlock-fix' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/mv-submodule-fix' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/user-useconfigonly' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ld/p4-test-py3' into HEAD | Junio C Hamano | 2016-05-18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-client-deadlock-fix' | Junio C Hamano | 2016-05-18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows: only add a no-op pthread_sigmask() when needed | Johannes Schindelin | 2016-05-11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows: add pthread_sigmask() that does nothing | Johannes Sixt | 2016-05-02 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thirteenth batch for 2.9 | Junio C Hamano | 2016-05-17 |