aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'pb/commit-verbose-config'Junio C Hamano2016-05-23
|\
| * commit: add a commit.verbose config variablePranit Bauva2016-05-10
| * t7507-commit-verbose: improve test coverage by testing number of diffsPranit Bauva2016-05-05
| * parse-options.c: make OPTION_COUNTUP respect "unspecified" valuesPranit Bauva2016-05-05
| * t/t7507: improve test coveragePranit Bauva2016-05-05
| * t0040-parse-options: improve test coveragePranit Bauva2016-05-05
| * test-parse-options: print quiet as integerPranit Bauva2016-04-19
| * t0040-test-parse-options.sh: fix style issuesPranit Bauva2016-04-19
* | Merge branch 'xy/format-patch-base'Junio C Hamano2016-05-23
|\ \
| * | format-patch: introduce format.useAutoBase configurationXiaolong Ye2016-04-26
| * | format-patch: introduce --base=auto optionXiaolong Ye2016-04-26
| * | format-patch: add '--base' option to record base tree infoXiaolong Ye2016-04-26
| * | patch-ids: make commit_patch_id() a public helper functionXiaolong Ye2016-04-26
* | | Merge branch 'tb/core-eol-fix'Junio C Hamano2016-05-23
|\ \ \
| * | | convert.c: ident + core.autocrlf didn't workTorsten Bögershausen2016-04-25
| * | | t0027: test cases for combined attributesTorsten Bögershausen2016-04-25
| * | | convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-25
| * | | t0027: make commit_chk_wrnNNO() reliableTorsten Bögershausen2016-04-25
| |/ /
* | | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-23
|\ \ \
| * | | branch: do not rename a branch under bisect or rebaseNguyễn Thái Ngọc Duy2016-04-22
| * | | worktree.c: check whether branch is bisected in another worktreeNguyễn Thái Ngọc Duy2016-04-22
| * | | wt-status.c: split bisect detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-22
| * | | worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy2016-04-22
| * | | worktree.c: avoid referencing to worktrees[i] multiple timesNguyễn Thái Ngọc Duy2016-04-22
| * | | wt-status.c: make wt_status_check_rebase() work on any worktreeNguyễn Thái Ngọc Duy2016-04-22
| * | | wt-status.c: split rebase detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy2016-04-22
| * | | path.c: refactor and add worktree_git_path()Nguyễn Thái Ngọc Duy2016-04-22
| * | | worktree.c: mark current worktreeNguyễn Thái Ngọc Duy2016-04-22
| * | | worktree.c: make find_shared_symref() return struct worktree *Nguyễn Thái Ngọc Duy2016-04-22
| * | | worktree.c: store "id" instead of "git_dir"Nguyễn Thái Ngọc Duy2016-04-22
| * | | path.c: add git_common_path() and strbuf_git_common_path()Nguyễn Thái Ngọc Duy2016-04-22
| * | | dir.c: rename str(n)cmp_icase to fspath(n)cmpNguyễn Thái Ngọc Duy2016-04-22
* | | | Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'Junio C Hamano2016-05-23
|\ \ \ \
| * | | | wt-status.c: set commitable bit if there is a meaningful merge.Stephen P. Smith2016-02-17
* | | | | Sync with 2.8.3Junio C Hamano2016-05-18
|\ \ \ \ \
| * | | | | Git 2.8.3v2.8.3Junio C Hamano2016-05-18
| * | | | | Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ew/doc-split-pack-disables-bitmap' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sb/clean-test-fix' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rn/glossary-typofix' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ew/normal-to-e' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/config-exit-status-list' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rt/string-list-lookup-cleanup' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fix-attribute-macro-in-2.5' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/test-lib-simplify-expr-away' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/remove-unused' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sk/gitweb-highlight-encoding' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/travis-submitting-patches' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/close-packs-before-gc' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-lfs' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \