summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t0040: convert all possible tests to use `test-parse-options --expect`pb/test-parse-options-expectPranit Bauva2016-10-171-170/+13
* Merge branch 'jc/test-parse-options-expect'Junio C Hamano2016-05-232-60/+93
|\
| * t0040: convert a few tests to use test-parse-options --expectjc/test-parse-options-expectJunio C Hamano2016-05-101-18/+2
| * t0040: remove unused test helpersJunio C Hamano2016-05-101-24/+0
| * test-parse-options: --expect=<string> option to simplify testsJunio C Hamano2016-05-102-15/+76
| * test-parse-options: fix output when callback option failsJunio C Hamano2016-05-102-5/+17
* | Merge branch 'pb/commit-verbose-config'Junio C Hamano2016-05-238-74/+268
|\ \ | |/
| * commit: add a commit.verbose config variablepb/commit-verbose-configPranit Bauva2016-05-104-1/+67
| * t7507-commit-verbose: improve test coverage by testing number of diffsPranit Bauva2016-05-051-7/+9
| * parse-options.c: make OPTION_COUNTUP respect "unspecified" valuesPranit Bauva2016-05-054-17/+24
| * t/t7507: improve test coveragePranit Bauva2016-05-051-0/+5
| * t0040-parse-options: improve test coveragePranit Bauva2016-05-051-0/+114
| * test-parse-options: print quiet as integerPranit Bauva2016-04-192-14/+14
| * t0040-test-parse-options.sh: fix style issuesPranit Bauva2016-04-191-38/+38
* | Merge branch 'xy/format-patch-base'Junio C Hamano2016-05-236-1/+340
|\ \
| * | format-patch: introduce format.useAutoBase configurationXiaolong Ye2016-04-263-6/+34
| * | format-patch: introduce --base=auto optionXiaolong Ye2016-04-263-3/+72
| * | format-patch: add '--base' option to record base tree infoXiaolong Ye2016-04-263-0/+240
| * | patch-ids: make commit_patch_id() a public helper functionXiaolong Ye2016-04-262-1/+3
* | | Merge branch 'tb/core-eol-fix'Junio C Hamano2016-05-234-189/+141
|\ \ \
| * | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fixTorsten Bögershausen2016-04-252-13/+8
| * | | t0027: test cases for combined attributesTorsten Bögershausen2016-04-251-169/+129
| * | | convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-252-7/+3
| * | | t0027: make commit_chk_wrnNNO() reliableTorsten Bögershausen2016-04-251-1/+2
| |/ /
* | | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-2317-82/+344
|\ \ \
| * | | branch: do not rename a branch under bisect or rebasend/worktree-various-headsNguyễn Thái Ngọc Duy2016-04-224-4/+40
| * | | worktree.c: check whether branch is bisected in another worktreeNguyễn Thái Ngọc Duy2016-04-222-0/+32
| * | | wt-status.c: split bisect detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-222-9/+16
| * | | worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy2016-04-226-6/+76
| * | | worktree.c: avoid referencing to worktrees[i] multiple timesNguyễn Thái Ngọc Duy2016-04-221-2/+4
| * | | wt-status.c: make wt_status_check_rebase() work on any worktreeNguyễn Thái Ngọc Duy2016-04-222-14/+24
| * | | wt-status.c: split rebase detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-222-6/+18
| * | | path.c: refactor and add worktree_git_path()Nguyễn Thái Ngọc Duy2016-04-222-6/+26
| * | | worktree.c: mark current worktreeNguyễn Thái Ngọc Duy2016-04-222-0/+25
| * | | worktree.c: make find_shared_symref() return struct worktree *Nguyễn Thái Ngọc Duy2016-04-225-23/+28
| * | | worktree.c: store "id" instead of "git_dir"Nguyễn Thái Ngọc Duy2016-04-223-15/+27
| * | | path.c: add git_common_path() and strbuf_git_common_path()Nguyễn Thái Ngọc Duy2016-04-222-0/+32
| * | | dir.c: rename str(n)cmp_icase to fspath(n)cmpNguyễn Thái Ngọc Duy2016-04-224-13/+12
* | | | Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'Junio C Hamano2016-05-232-0/+21
|\ \ \ \
| * | | | wt-status.c: set commitable bit if there is a meaningful merge.ss/commit-dry-run-resolve-merge-to-no-opStephen P. Smith2016-02-172-0/+21
* | | | | Sync with 2.8.3Junio C Hamano2016-05-182-3/+35
|\ \ \ \ \
| * | | | | Git 2.8.3v2.8.3Junio C Hamano2016-05-184-5/+37
| * | | | | Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-186-21/+29
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ew/doc-split-pack-disables-bitmap' into HEADJunio C Hamano2016-05-184-9/+23
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sb/clean-test-fix' into HEADJunio C Hamano2016-05-181-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rn/glossary-typofix' into HEADJunio C Hamano2016-05-181-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ew/normal-to-e' into HEADJunio C Hamano2016-05-181-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/config-exit-status-list' into HEADJunio C Hamano2016-05-181-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rt/string-list-lookup-cleanup' into HEADJunio C Hamano2016-05-181-4/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fix-attribute-macro-in-2.5' into HEADJunio C Hamano2016-05-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status