aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nf/mergetool-prompt' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jd/send-email-to-whom' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/win32-mmap' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-client-deadlock-fix' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/user-useconfigonly' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ld/p4-test-py3' into HEADJunio C Hamano2016-05-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-client-deadlock-fix'Junio C Hamano2016-05-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows: only add a no-op pthread_sigmask() when neededJohannes Schindelin2016-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows: add pthread_sigmask() that does nothingJohannes Sixt2016-05-02
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thirteenth batch for 2.9Junio C Hamano2016-05-17
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kf/gpg-sig-verification-doc'Junio C Hamano2016-05-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: clarify signature verificationKeller Fuchs2016-05-13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/windows-dotgit'Junio C Hamano2016-05-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingw: remove unnecessary definitionJohannes Schindelin2016-05-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingw: introduce the 'core.hideDotFiles' settingJohannes Schindelin2016-05-11
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'va/mailinfo-doc-typofix'Junio C Hamano2016-05-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-mailinfo: fix typoVasco Almeida2016-05-11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-send-sh-x-trace-elsewhere'Junio C Hamano2016-05-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib: set BASH_XTRACEFD automaticallyJeff King2016-05-11
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |