Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t0040: remove unused test helpers | Junio C Hamano | 2016-05-10 | 1 | -24/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | test-parse-options: --expect=<string> option to simplify tests | Junio C Hamano | 2016-05-10 | 2 | -15/+76 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | test-parse-options: fix output when callback option fails | Junio C Hamano | 2016-05-10 | 2 | -5/+17 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pb/commit-verbose-config' | Junio C Hamano | 2016-05-23 | 8 | -74/+268 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: add a commit.verbose config variablepb/commit-verbose-config | Pranit Bauva | 2016-05-10 | 4 | -1/+67 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t7507-commit-verbose: improve test coverage by testing number of diffs | Pranit Bauva | 2016-05-05 | 1 | -7/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | parse-options.c: make OPTION_COUNTUP respect "unspecified" values | Pranit Bauva | 2016-05-05 | 4 | -17/+24 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t7507: improve test coverage | Pranit Bauva | 2016-05-05 | 1 | -0/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t0040-parse-options: improve test coverage | Pranit Bauva | 2016-05-05 | 1 | -0/+114 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | test-parse-options: print quiet as integer | Pranit Bauva | 2016-04-19 | 2 | -14/+14 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t0040-test-parse-options.sh: fix style issues | Pranit Bauva | 2016-04-19 | 1 | -38/+38 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'xy/format-patch-base' | Junio C Hamano | 2016-05-23 | 6 | -1/+340 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: introduce format.useAutoBase configuration | Xiaolong Ye | 2016-04-26 | 3 | -6/+34 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: introduce --base=auto option | Xiaolong Ye | 2016-04-26 | 3 | -3/+72 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: add '--base' option to record base tree info | Xiaolong Ye | 2016-04-26 | 3 | -0/+240 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch-ids: make commit_patch_id() a public helper function | Xiaolong Ye | 2016-04-26 | 2 | -1/+3 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/core-eol-fix' | Junio C Hamano | 2016-05-23 | 4 | -189/+141 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fix | Torsten Bögershausen | 2016-04-25 | 2 | -13/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0027: test cases for combined attributes | Torsten Bögershausen | 2016-04-25 | 1 | -169/+129 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert: allow core.autocrlf=input and core.eol=crlf | Torsten Bögershausen | 2016-04-25 | 2 | -7/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0027: make commit_chk_wrnNNO() reliable | Torsten Bögershausen | 2016-04-25 | 1 | -1/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-various-heads' | Junio C Hamano | 2016-05-23 | 17 | -82/+344 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch: do not rename a branch under bisect or rebasend/worktree-various-heads | Nguyễn Thái Ngọc Duy | 2016-04-22 | 4 | -4/+40 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree.c: check whether branch is bisected in another worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | 2 | -0/+32 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status.c: split bisect detection out of wt_status_get_state() | Nguyễn Thái Ngọc Duy | 2016-04-22 | 2 | -9/+16 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree.c: check whether branch is rebased in another worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | 6 | -6/+76 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree.c: avoid referencing to worktrees[i] multiple times | Nguyễn Thái Ngọc Duy | 2016-04-22 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status.c: make wt_status_check_rebase() work on any worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | 2 | -14/+24 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status.c: split rebase detection out of wt_status_get_state() | Nguyễn Thái Ngọc Duy | 2016-04-22 | 2 | -6/+18 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | path.c: refactor and add worktree_git_path() | Nguyễn Thái Ngọc Duy | 2016-04-22 | 2 | -6/+26 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree.c: mark current worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | 2 | -0/+25 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree.c: make find_shared_symref() return struct worktree * | Nguyễn Thái Ngọc Duy | 2016-04-22 | 5 | -23/+28 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree.c: store "id" instead of "git_dir" | Nguyễn Thái Ngọc Duy | 2016-04-22 | 3 | -15/+27 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | path.c: add git_common_path() and strbuf_git_common_path() | Nguyễn Thái Ngọc Duy | 2016-04-22 | 2 | -0/+32 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c: rename str(n)cmp_icase to fspath(n)cmp | Nguyễn Thái Ngọc Duy | 2016-04-22 | 4 | -13/+12 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op' | Junio C Hamano | 2016-05-23 | 2 | -0/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status.c: set commitable bit if there is a meaningful merge.ss/commit-dry-run-resolve-merge-to-no-op | Stephen P. Smith | 2016-02-17 | 2 | -0/+21 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync with 2.8.3 | Junio C Hamano | 2016-05-18 | 2 | -3/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.8.3v2.8.3 | Junio C Hamano | 2016-05-18 | 4 | -5/+37 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/misc-cleanups' into HEAD | Junio C Hamano | 2016-05-18 | 6 | -21/+29 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/doc-split-pack-disables-bitmap' into HEAD | Junio C Hamano | 2016-05-18 | 4 | -9/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/clean-test-fix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rn/glossary-typofix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/normal-to-e' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/config-exit-status-list' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rt/string-list-lookup-cleanup' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/test-lib-simplify-expr-away' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/remove-unused' into HEAD | Junio C Hamano | 2016-05-18 | 4 | -27/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sk/gitweb-highlight-encoding' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |